diff --git a/ci/test_riscv_isa.sh b/ci/test_riscv_isa.sh
index f0bc11c9..c22540b6 100755
--- a/ci/test_riscv_isa.sh
+++ b/ci/test_riscv_isa.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-make -C benchmarks/riscv_tests/isa run
+make -C hw/simulate run
diff --git a/hw/simulate/testbench.cpp b/hw/simulate/testbench.cpp
index 4795b957..ec990759 100644
--- a/hw/simulate/testbench.cpp
+++ b/hw/simulate/testbench.cpp
@@ -142,17 +142,16 @@ int main(int argc, char **argv) {
 #endif
 
 }	else {
-	bool passed = true;
+	std::vector<std::string> tests(argv+2, argv+argc);
+	for (std::string test : tests) {		
+		std::cout << test << std::endl;
 
-	std::string test(argv[2]);
-	
-	std::cout << test << std::endl;
-
-	RAM ram;
-	Simulator simulator;
-	simulator.attach_ram(&ram);
-	simulator.load_ihex(test.c_str());
-	simulator.run();
+		RAM ram;
+		Simulator simulator;
+		simulator.attach_ram(&ram);
+		simulator.load_ihex(test.c_str());
+		simulator.run();
+	}
 	
 	return 0;
 }