diff --git a/Makefile b/Makefile
index a42d392073..f84c213449 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,19 @@ test-debugger: all
 	$(PYTHON) tools/test.py debugger
 
 test-npm: node
-	./node deps/npm/test/run.js
+	rm -rf npm-cache npm-tmp npm-prefix
+	mkdir npm-cache npm-tmp npm-prefix
+	cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
+	     npm_config_prefix="$(shell pwd)/npm-prefix" \
+	     npm_config_tmp="$(shell pwd)/npm-tmp" \
+	     ../../node cli.js install
+	cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
+	     npm_config_prefix="$(shell pwd)/npm-prefix" \
+	     npm_config_tmp="$(shell pwd)/npm-tmp" \
+	     ../../node cli.js run-script test-all && \
+	     ../../node cli.js prune --prod && \
+	     cd ../.. && \
+	     rm -rf npm-cache npm-tmp npm-prefix
 
 test-npm-publish: node
 	npm_package_config_publishtest=true ./node deps/npm/test/run.js