diff --git a/Makefile b/Makefile
index 8048c6c1..64b66438 100644
--- a/Makefile
+++ b/Makefile
@@ -7,5 +7,14 @@ clean:
 config/environments/test.js: config/environments/test.js.example
 	./configure
 
-check: config/environments/test.js
+check-local: config/environments/test.js
 	./run_tests.sh
+
+check-submodules:
+	for sub in windshaft grainstore mapnik; do \
+		test -e node_modules/$${sub} && make -C node_modules/$${sub} check; \
+	done
+
+check-full: check-local check-submodules
+
+check: check-local