diff --git a/tests/Makefile b/tests/Makefile
index 63551ecaa..cba84b11d 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -69,7 +69,7 @@ MK_TEST_DIRS += ./peepopt
 MK_TEST_DIRS += ./proc
 MK_TEST_DIRS += ./blif
 #SH_TEST_DIRS += ./arch
-#SH_TEST_DIRS += ./rpc
+MK_TEST_DIRS += ./rpc
 MK_TEST_DIRS += ./memfile
 #SH_TEST_DIRS += ./fmt
 #SH_TEST_DIRS += ./cxxrtl
diff --git a/tests/rpc/generate_mk.py b/tests/rpc/generate_mk.py
index 6a921d5a0..95ab05a7d 100644
--- a/tests/rpc/generate_mk.py
+++ b/tests/rpc/generate_mk.py
@@ -4,5 +4,14 @@ import sys
 sys.path.append("..")
 
 import gen_tests_makefile
+import glob
 
-gen_tests_makefile.generate(["--yosys-scripts"])
+def create_tests():
+    yss = sorted(glob.glob("*.ys"))
+    for ys in yss:
+        gen_tests_makefile.generate_ys_test(ys)
+
+    cmd = [ "python3 frontend.py unix-socket frontend.sock >/dev/null 2>&1" ]
+    gen_tests_makefile.generate_cmd_test("frontend.py", cmd)
+
+gen_tests_makefile.generate_custom(create_tests)
diff --git a/tests/rpc/run-test.sh b/tests/rpc/run-test.sh
deleted file mode 100755
index 0d58b0de2..000000000
--- a/tests/rpc/run-test.sh
+++ /dev/null
@@ -1,8 +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
-python3 frontend.py unix-socket frontend.sock