diff --git a/test/Makefile b/test/Makefile
index d1168f008d66433a4111b4e248005d8b202b2ba3..230d3ee72e6f89d852df40fdd5de9c607204f146 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -7,7 +7,6 @@ DIRS += simple
 DIRS += johng
 DIRS += validate
 DIRS += demo
-DIRS += race
 
 ifeq '$(EPICS_HAS_UNIT_TEST)' '1'
 DIRS += unit
diff --git a/test/race/Makefile b/test/race/Makefile
deleted file mode 100644
index 0dfc1af0df00ad6a3af5ffda9eb04ebb991f2dcb..0000000000000000000000000000000000000000
--- a/test/race/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-TOP = ../..
-
-include $(TOP)/configure/CONFIG
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-SNC = $(INSTALL_HOST_BIN)/snc
-
-#  Generate snc main programs
-SNCFLAGS_DEFAULT += +m
-SNCFLAGS_vxWorks += -nil-
-
-# Products
-TESTPROD_HOST += race
-
-race_SRCS += race.st
-
-race_LIBS += seq pv
-race_LIBS += $(EPICS_BASE_IOC_LIBS)
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
-runtest: install
-	splitvt -upper 'softIoc -s -d race.db'\
-		-lower './O.$(EPICS_HOST_ARCH)/race -s'
diff --git a/test/validate/Makefile b/test/validate/Makefile
index 10d3ef0e196507f042fe52bd5ede812ecd9fea01..c788049891dbd5b476604ee97de3898624c9c73b 100644
--- a/test/validate/Makefile
+++ b/test/validate/Makefile
@@ -31,6 +31,7 @@ PROD += array
 PROD += stop
 PROD += userfunc
 PROD += eftest
+PROD += race
 
 #PROD += ctest
 
@@ -52,6 +53,7 @@ DB_INSTALLS += pvGetComplete.db
 DB_INSTALLS += pvPutAsync.db
 DB_INSTALLS += userfunc.db
 DB_INSTALLS += eftest.db
+DB_INSTALLS += race.db
 
 include $(TOP)/configure/RULES
 #----------------------------------------
diff --git a/test/race/race.db b/test/validate/race.db
similarity index 100%
rename from test/race/race.db
rename to test/validate/race.db
diff --git a/test/race/race.st b/test/validate/race.st
similarity index 100%
rename from test/race/race.st
rename to test/validate/race.st