diff --git a/tests/Makefile b/tests/Makefile
index 1e1c18092..ecc5129a2 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -49,9 +49,6 @@ MK_TEST_DIRS += ./verific
 endif
 endif
 MK_TEST_DIRS += ./verilog
-
-# Tests that don't generate .mk
-SH_TEST_DIRS =
 MK_TEST_DIRS += ./simple
 MK_TEST_DIRS += ./simple_abc9
 MK_TEST_DIRS += ./hana
@@ -71,28 +68,18 @@ MK_TEST_DIRS += ./blif
 MK_TEST_DIRS += ./arch
 MK_TEST_DIRS += ./rpc
 MK_TEST_DIRS += ./memfile
-#SH_TEST_DIRS += ./fmt
+#MK_TEST_DIRS += ./fmt
 MK_TEST_DIRS += ./cxxrtl
 MK_TEST_DIRS += ./liberty
-#ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
-#SH_TEST_DIRS += ./functional
-#endif
-
-# Tests that don't generate .mk and need special args
+ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
+MK_TEST_DIRS += ./functional
+endif
 MK_TEST_DIRS += ./memories
 MK_TEST_DIRS += ./aiger
 MK_TEST_DIRS += ./alumacc
 
 all: vanilla-test
 
-# seed-./ is a dummy string, not a directory
-.PHONY: seed-tests
-seed-tests: $(SH_TEST_DIRS:%=seed-./%)
-.PHONY: seed-./%
-seed-./%: %/run-test.sh
-	+cd $* && bash run-test.sh $(SEEDOPT)
-	+@echo "...passed tests in $*"
-
 # makefile-./ is a dummy string, not a directory
 .PHONY: makefile-tests
 .SILENT: $(MK_TEST_DIRS:%=%/Makefile)
@@ -109,7 +96,7 @@ makefile-./%: %/Makefile
 	@$(MAKE) -C $*
 	@echo "...passed tests in $*"
 
-vanilla-test: makefile-tests seed-tests
+vanilla-test: prep makefile-tests
 	@echo ""
 	@echo "  Passed \"make vanilla-test\"."
 ifeq ($(ENABLE_VERIFIC),1)
diff --git a/tests/functional/generate_mk.py b/tests/functional/generate_mk.py
new file mode 100644
index 000000000..3d63d1fe9
--- /dev/null
+++ b/tests/functional/generate_mk.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+import sys
+sys.path.append("..")
+
+import gen_tests_makefile
+
+def callback():
+    gen_tests_makefile.generate_cmd_test("functional",f'pytest -v -m "not smt and not rkt" . "$$@"')
+
+gen_tests_makefile.generate_custom(callback)