diff --git a/Makefile.in b/Makefile.in
index 325e102c3..45852375d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -401,7 +401,7 @@ nsock_check:
 	@cd $(NSOCKDIR)/src && $(MAKE) check
 
 zenmap_check:
-	@cd $(ZENMAPDIR) && $(PYTHON) -m unittest discover build/lib.* '*.py'
+	@cd $(ZENMAPDIR)/test && $(PYTHON) run_tests.py
 
 check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@ @NSE_CHECK@ @NDIFF_CHECK@
 
diff --git a/zenmap/test/run_tests.py b/zenmap/test/run_tests.py
new file mode 100644
index 000000000..7b6e8b596
--- /dev/null
+++ b/zenmap/test/run_tests.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+import unittest
+
+if __name__ == "__main__":
+    import sys
+    import glob
+    import os
+    if not hasattr(unittest.defaultTestLoader, "discover"):
+        print("Python unittest discovery missing. Requires Python 2.7 or newer.")
+        sys.exit(0)
+
+    os.chdir("..")
+    suite = unittest.defaultTestLoader.discover(
+            start_dir=glob.glob("build/lib.*")[0],
+            pattern="*.py"
+            )
+    unittest.TextTestRunner().run(suite)