diff --git a/src/ioc/db/test/Makefile b/src/ioc/db/test/Makefile
index 77e485aec..215545f4a 100644
--- a/src/ioc/db/test/Makefile
+++ b/src/ioc/db/test/Makefile
@@ -138,21 +138,6 @@ testHarness_SRCS += dbPutGetTest.db
 TESTFILES += ../dbPutGetTest.db
 TESTS += testPutGetTest
 
-TARGETS += $(COMMON_DIR)/scanEventTest.dbd
-DBDDEPENDS_FILES += scanEventTest.dbd$(DEP)
-scanEventTest_DBD += menuGlobal.dbd
-scanEventTest_DBD += menuConvert.dbd
-scanEventTest_DBD += menuScan.dbd
-scanEventTest_DBD += eventRecord.dbd
-scanEventTest_DBD += devEventSoft.dbd
-scanEventTest_DBD += calcRecord.dbd
-scanEventTest_DBD += dfanoutRecord.dbd
-TESTPROD_HOST += scanEventTest
-scanEventTest_SRCS += scanEventTest.c
-scanEventTest_SRCS += scanEventTest_registerRecordDeviceDriver.cpp
-scanEventTest_LIBS = dbRecStd
-TESTS += scanEventTest
-
 # This runs all the test programs in a known working order:
 testHarness_SRCS += epicsRunDbTests.c
 
diff --git a/src/ioc/db/test/devEventSoft.dbd b/src/ioc/db/test/devEventSoft.dbd
deleted file mode 100644
index ec3bc2d07..000000000
--- a/src/ioc/db/test/devEventSoft.dbd
+++ /dev/null
@@ -1 +0,0 @@
-device(event,CONSTANT,devEventSoft,"Soft Channel")
diff --git a/src/ioc/db/test/epicsRunDbTests.c b/src/ioc/db/test/epicsRunDbTests.c
index ce41815fb..05fedeb51 100644
--- a/src/ioc/db/test/epicsRunDbTests.c
+++ b/src/ioc/db/test/epicsRunDbTests.c
@@ -29,7 +29,6 @@ int testDbChannel(void);
 int chfPluginTest(void);
 int arrShorthandTest(void);
 int recGblCheckDeadbandTest(void);
-int scanEventTest(void);
 
 void epicsRunDbTests(void)
 {
@@ -48,7 +47,6 @@ void epicsRunDbTests(void)
     runTest(arrShorthandTest);
     runTest(recGblCheckDeadbandTest);
     runTest(chfPluginTest);
-    runTest(scanEventTest);
 
     dbmfFreeChunks();
 
diff --git a/src/std/rec/test/Makefile b/src/std/rec/test/Makefile
index 5322c8e92..70b6e173e 100644
--- a/src/std/rec/test/Makefile
+++ b/src/std/rec/test/Makefile
@@ -37,6 +37,15 @@ testHarness_SRCS += analogMonitorTest_registerRecordDeviceDriver.cpp
 TESTFILES += $(COMMON_DIR)/analogMonitorTest.dbd ../analogMonitorTest.db
 TESTS += analogMonitorTest
 
+TARGETS += $(COMMON_DIR)/scanEventTest.dbd
+DBDDEPENDS_FILES += scanEventTest.dbd$(DEP)
+scanEventTest_DBD += base.dbd
+TESTPROD_HOST += scanEventTest
+scanEventTest_SRCS += scanEventTest.c
+scanEventTest_SRCS += scanEventTest_registerRecordDeviceDriver.cpp
+TESTFILES += $(COMMON_DIR)/scanEventTest.dbd ../scanEventTest.db
+TESTS += scanEventTest
+
 TARGETS += $(COMMON_DIR)/regressTest.dbd
 DBDDEPENDS_FILES += regressTest.dbd$(DEP)
 regressTest_DBD += base.dbd
diff --git a/src/std/rec/test/epicsRunRecordTests.c b/src/std/rec/test/epicsRunRecordTests.c
index 092c0a6ce..1a7133c19 100644
--- a/src/std/rec/test/epicsRunRecordTests.c
+++ b/src/std/rec/test/epicsRunRecordTests.c
@@ -14,6 +14,7 @@
 
 int analogMonitorTest(void);
 int arrayOpTest(void);
+int scanEventTest(void);
 
 void epicsRunRecordTests(void)
 {
@@ -22,6 +23,7 @@ void epicsRunRecordTests(void)
     runTest(analogMonitorTest);
 
     runTest(arrayOpTest);
+    runTest(scanEventTest);
 
     epicsExit(0);   /* Trigger test harness */
 }
diff --git a/src/ioc/db/test/scanEventTest.c b/src/std/rec/test/scanEventTest.c
similarity index 100%
rename from src/ioc/db/test/scanEventTest.c
rename to src/std/rec/test/scanEventTest.c
diff --git a/src/ioc/db/test/scanEventTest.db b/src/std/rec/test/scanEventTest.db
similarity index 100%
rename from src/ioc/db/test/scanEventTest.db
rename to src/std/rec/test/scanEventTest.db