diff --git a/compiler/Makefile b/compiler/Makefile
index 67cf36c87..b5231e0fe 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -134,7 +134,7 @@ build-unit-tests:
 	cmake --build $(BUILD_DIR) --target ConcretelangUnitTests
 
 run-unit-tests: build-unit-tests
-	find $(BUILD_DIR)/tools/concretelang/tests/unit_tests -name unit_tests_concretelang* -executable -type f -exec {} \;
+	find $(BUILD_DIR)/tools/concretelang/tests/unit_tests -name unit_tests_concretelang* -executable -type f | xargs -n1 ./run_test_bin.sh
 
 ## python-tests
 
@@ -149,7 +149,7 @@ test-compiler-file-output: concretecompiler
 build-end-to-end-tests: build-end-to-end-jit-test build-end-to-end-jit-clear-tensor build-end-to-end-jit-fhe build-end-to-end-jit-encrypted-tensor build-end-to-end-jit-fhelinalg build-end-to-end-jit-lambda
 
 run-end-to-end-tests: build-end-to-end-tests
-	find $(BUILD_DIR)/tools/concretelang/tests/end_to_end_tests -name end_to_end* -executable -type f -exec {} \;
+	find $(BUILD_DIR)/tools/concretelang/tests/end_to_end_tests -name end_to_end* -executable -type f | xargs -n1 ./run_test_bin.sh
 
 build-end-to-end-jit-test: build-initialized
 	cmake --build $(BUILD_DIR) --target end_to_end_jit_test
diff --git a/compiler/run_test_bin.sh b/compiler/run_test_bin.sh
new file mode 100755
index 000000000..5c1437908
--- /dev/null
+++ b/compiler/run_test_bin.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+$1