diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 950f7e1..fe29daf 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -942,7 +942,10 @@
         return (instance for instance in instances if instance.probe())
 
     def build_system(self, preferred=None):
-        systems = self.build_systems()
+        systems = list(self.build_systems())
+
+        if not systems:
+            return None
 
         if preferred:
             return {type(system): system for system in systems}[preferred]
@@ -1082,6 +1085,12 @@
     if FORMAT_CODE:
         check_call_cmd("./format-code.sh", CODE_SCAN_DIR)
 
+    # Check if this repo has a supported make infrastructure
+    pkg = Package(UNIT_TEST_PKG, os.path.join(WORKSPACE, UNIT_TEST_PKG))
+    if not pkg.build_system():
+        print("No valid build system, exit")
+        sys.exit(0)
+
     prev_umask = os.umask(000)
 
     # Determine dependencies and add them