diff --git a/driver/tests/Makefile b/driver/tests/Makefile
new file mode 100644
index 00000000..4a91d0de
--- /dev/null
+++ b/driver/tests/Makefile
@@ -0,0 +1,14 @@
+all:
+	$(MAKE) -C basic
+	$(MAKE) -C demo
+
+run:
+	$(MAKE) -C basic run-rtlsim
+	$(MAKE) -C basic run-simx
+	$(MAKE) -C demo run-rtlsim
+	$(MAKE) -C demo run-simx
+
+clean:
+	$(MAKE) -C basic clean
+	$(MAKE) -C demo clean
+
diff --git a/runtime/tests/Makefile b/runtime/tests/Makefile
index 4543b3ef..9741cb76 100644
--- a/runtime/tests/Makefile
+++ b/runtime/tests/Makefile
@@ -6,11 +6,11 @@ all:
 	$(MAKE) -C vecadd
 
 run:
-	cd simple && $(MAKE) run
-	cd dev && $(MAKE) run	
-	cd hello && $(MAKE) run
-	cd nlTest && $(MAKE) run
-	cd vecadd && $(MAKE) run
+	$(MAKE) -C simple run
+	$(MAKE) -C dev run	
+	$(MAKE) -C hello run
+	$(MAKE) -C nlTest run
+	$(MAKE) -C vecadd run
 
 clean:
 	$(MAKE) -C simple clean