diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bfd42d2ea2a631e741be16f944a020d8bae850b..e623f46e87e35c392d4316af63fe3f7f399e7ed2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,4 +60,4 @@ test require:
   before_script:
     - source $(pwd)/epics/base-*/require/*/bin/setE3Env.bash
   script:
-    - echo exit | iocsh.bash
\ No newline at end of file
+    - make test
\ No newline at end of file
diff --git a/configure/CONFIG b/configure/CONFIG
index d747a382e60dadbc5f0dbe3563f3333bcc147dba..5182910023e9a2a916ed9640d2e8312d8b635810 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -25,6 +25,7 @@ include $(TOP)/configure/E3/CONFIG_E3_PATH
 include $(TOP)/configure/E3/CONFIG_E3_MAKEFILE
 include $(TOP)/configure/E3/CONFIG_EPICS
 include $(TOP)/configure/E3/CONFIG_EXPORT
+include $(TOP)/configure/E3/CONFIG_TEST
 
 
 VARS_EXCLUDES+=EPICS_VERSION
diff --git a/configure/E3/CONFIG_TEST b/configure/E3/CONFIG_TEST
new file mode 100644
index 0000000000000000000000000000000000000000..1a89b51eb5998218b4045c72feaab2ca94f222ff
--- /dev/null
+++ b/configure/E3/CONFIG_TEST
@@ -0,0 +1,3 @@
+TEST_DIR:=$(TOP)/tests
+
+TESTS:=$(wildcard $(TEST_DIR)/test*)
\ No newline at end of file
diff --git a/configure/E3/RULES_TEST b/configure/E3/RULES_TEST
new file mode 100644
index 0000000000000000000000000000000000000000..eeb09307d8a320bb869cee71df39eff80bd5e742
--- /dev/null
+++ b/configure/E3/RULES_TEST
@@ -0,0 +1,8 @@
+.PHONY: test
+
+test: $(TESTS)
+
+.PHONY: $(TESTS)
+$(TESTS):
+	$(info Running test $@...)
+	${QUIET}${MAKE} -C $@ test
diff --git a/configure/RULES b/configure/RULES
index 02026e3d3d129598e499127cd7faa84db928adc1..49e2bba9ac5185131d91e86a39aee2e2fe70f329 100644
--- a/configure/RULES
+++ b/configure/RULES
@@ -15,6 +15,7 @@ include $(TOP)/configure/E3/RULES_REQUIRE
 include $(TOP)/configure/E3/RULES_PATCH
 include $(TOP)/configure/E3/RULES_DB
 include $(TOP)/configure/E3/RULES_VARS
+include $(TOP)/configure/E3/RULES_TEST
 
 
 ifneq (,$(findstring dev,$(MAKECMDGOALS)))
diff --git a/tests/test_iocsh/Makefile b/tests/test_iocsh/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a8104d32fd294fdf8b67242e1617c582541ce857
--- /dev/null
+++ b/tests/test_iocsh/Makefile
@@ -0,0 +1,4 @@
+.PHONY: test
+
+test: 
+	echo exit | iocsh.bash
\ No newline at end of file