diff --git a/Makefile b/Makefile
index 1be2664..a634551 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ clean:
 
 install: env node_modules pelican_plugins
 
-pelican_plugins:
+pelican_plugins: env
 	git clone --recursive https://github.com/getpelican/pelican-plugins --depth=1 pelican_plugins/
 	@echo ">> Hotfixing..."
 	rm -rf pelican_plugins/pelican-jinja2content
@@ -35,7 +35,7 @@ env:
 	pyvenv env
 	$(ENV)/pip install -r requirements.txt
 
-node_modules:
+node_modules: env
 	@source ~/.nvm/nvm.sh && nvm install
 	npm install
 
diff --git a/circle.yml b/circle.yml
index be12963..d40bd1d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,12 +8,9 @@ machine:
 
 dependencies:
   pre:
-    - make
-  cache_directories:
-    - env
-    - node_modules
-    - pelican_plugins
+    - make install
 
 test:
   override:
+    - make build
     - make test