diff --git a/tests/Makefile b/tests/Makefile
index cf46444f8..077f11c41 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -71,9 +71,9 @@ MK_TEST_DIRS += ./memfile
 MK_TEST_DIRS += ./fmt
 MK_TEST_DIRS += ./cxxrtl
 MK_TEST_DIRS += ./liberty
-ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
-MK_TEST_DIRS += ./functional
-endif
+#ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
+#MK_TEST_DIRS += ./functional
+#endif
 MK_TEST_DIRS += ./memories
 MK_TEST_DIRS += ./aiger
 MK_TEST_DIRS += ./alumacc
@@ -96,7 +96,13 @@ makefile-./%: %/Makefile
 	@$(MAKE) -C $*
 	@echo "...passed tests in $*"
 
-vanilla-test: prep makefile-tests
+.PHONY: functional
+functional:
+ifeq ($(ENABLE_FUNCTIONAL_TESTS),1)
+	@cd functional && ./run-test.sh
+endif
+
+vanilla-test: prep makefile-tests functional
 	@echo ""
 	@echo "  Passed \"make vanilla-test\"."
 ifeq ($(ENABLE_VERIFIC),1)
diff --git a/tests/functional/run-test.sh b/tests/functional/run-test.sh
new file mode 100755
index 000000000..8f72f7c1b
--- /dev/null
+++ b/tests/functional/run-test.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+pytest -v -m "not smt and not rkt" "$SCRIPT_DIR" "$@"