diff --git a/Makefile b/Makefile
index 87afe29b46828f..6ee778ba1752d2 100644
--- a/Makefile
+++ b/Makefile
@@ -300,7 +300,7 @@ jstest: build-addons build-js-native-api-tests build-node-api-tests ## Runs addo
 
 .PHONY: tooltest
 tooltest:
-	@$(PYTHON) test/tools/test-js2c.py
+	@$(PYTHON) -m unittest discover -s ./test/tools
 
 .PHONY: coverage-run-js
 coverage-run-js:
diff --git a/test/tools/test_configure.py b/test/tools/test_configure.py
new file mode 100644
index 00000000000000..c4e65192c9b3d1
--- /dev/null
+++ b/test/tools/test_configure.py
@@ -0,0 +1,29 @@
+import sys
+import os
+import unittest
+import subprocess
+
+
+class ConfigureTests(unittest.TestCase):
+  def setUp(self):
+    self.working_dir = os.path.abspath(
+      os.path.join(
+        os.path.dirname(__file__),
+        '..', '..'
+      )
+    )
+
+  def test_ninja(self):
+    subprocess.check_call(
+      './configure --ninja',
+      cwd=self.working_dir,
+      shell=True,
+      stdout=subprocess.PIPE,
+      stderr=subprocess.PIPE
+    )
+
+
+if (__name__ == '__main__' and
+    sys.platform in ['linux', 'linux2', 'darwin', 'cygwin']):
+
+  unittest.main()
diff --git a/test/tools/test-js2c.py b/test/tools/test_js2c.py
similarity index 100%
rename from test/tools/test-js2c.py
rename to test/tools/test_js2c.py