diff --git a/tests/Makefile b/tests/Makefile
index 6b8535822..23d152bd7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -64,9 +64,9 @@ MK_TEST_DIRS += ./asicworld
 #SH_TEST_DIRS += ./bram
 #SH_TEST_DIRS += ./svinterfaces
 #SH_TEST_DIRS += ./xprop
-#SH_TEST_DIRS += ./select
-#SH_TEST_DIRS += ./peepopt
-#SH_TEST_DIRS += ./proc
+MK_TEST_DIRS += ./select
+MK_TEST_DIRS += ./peepopt
+MK_TEST_DIRS += ./proc
 MK_TEST_DIRS += ./blif
 #SH_TEST_DIRS += ./arch
 #SH_TEST_DIRS += ./rpc
diff --git a/tests/peepopt/generate_mk.py b/tests/peepopt/generate_mk.py
new file mode 100644
index 000000000..6a921d5a0
--- /dev/null
+++ b/tests/peepopt/generate_mk.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+
+import sys
+sys.path.append("..")
+
+import gen_tests_makefile
+
+gen_tests_makefile.generate(["--yosys-scripts"])
diff --git a/tests/peepopt/run-test.sh b/tests/peepopt/run-test.sh
deleted file mode 100644
index 2e3f5235c..000000000
--- a/tests/peepopt/run-test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-source ../common-env.sh
-set -e
-for x in *.ys; do
-  echo "Running $x.."
-  ../../yosys -ql ${x%.ys}.log $x
-done
diff --git a/tests/proc/generate_mk.py b/tests/proc/generate_mk.py
new file mode 100644
index 000000000..6a921d5a0
--- /dev/null
+++ b/tests/proc/generate_mk.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+
+import sys
+sys.path.append("..")
+
+import gen_tests_makefile
+
+gen_tests_makefile.generate(["--yosys-scripts"])
diff --git a/tests/proc/run-test.sh b/tests/proc/run-test.sh
deleted file mode 100755
index 241b32295..000000000
--- a/tests/proc/run-test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-source ../common-env.sh
-set -e
-for x in *.ys; do
-  echo "Running $x.."
-  ../../yosys -ql ${x%.ys}.log $x >/dev/null 2>&1
-done
diff --git a/tests/select/generate_mk.py b/tests/select/generate_mk.py
new file mode 100644
index 000000000..6a921d5a0
--- /dev/null
+++ b/tests/select/generate_mk.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+
+import sys
+sys.path.append("..")
+
+import gen_tests_makefile
+
+gen_tests_makefile.generate(["--yosys-scripts"])
diff --git a/tests/select/run-test.sh b/tests/select/run-test.sh
deleted file mode 100755
index 241b32295..000000000
--- a/tests/select/run-test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-source ../common-env.sh
-set -e
-for x in *.ys; do
-  echo "Running $x.."
-  ../../yosys -ql ${x%.ys}.log $x >/dev/null 2>&1
-done