diff --git a/Makefile b/Makefile
index fa6208930db..201f65a6b03 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ test-valgrind: all
 
 test-all: all
 	python tools/test.py --mode=debug,release
+	make test-npm
 
 test-all-http1: all
 	python tools/test.py --mode=debug,release --use-http1
@@ -67,6 +68,11 @@ test-pummel: all
 test-internet: all
 	python tools/test.py internet
 
+test-npm: all
+	./node deps/npm/test/run.js
+
+test-npm-publish: all
+	npm_package_config_publishtest=true ./node deps/npm/test/run.js
 
 out/Release/node: all