diff --git a/src/ioc/db/test/Makefile b/src/ioc/db/test/Makefile
index d8ca0f15b..baa381534 100644
--- a/src/ioc/db/test/Makefile
+++ b/src/ioc/db/test/Makefile
@@ -184,6 +184,10 @@ TESTSPEC_vxWorks = dbTestHarness.munch; epicsRunDbTests
 TESTSPEC_RTEMS = dbTestHarness.boot; epicsRunDbTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/libCom/test/Makefile b/src/libCom/test/Makefile
index 9b3b7dacd..0aba60e32 100755
--- a/src/libCom/test/Makefile
+++ b/src/libCom/test/Makefile
@@ -230,6 +230,10 @@ TESTSPEC_vxWorks = libComTestHarness.munch; epicsRunLibComTests
 TESTSPEC_RTEMS = libComTestHarness.boot; epicsRunLibComTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(filter-out epicsUnitTestTest.t, $(TESTS:%=%.t))
+endif
 
 
 # The following are not test programs, they measure performance.
diff --git a/src/std/filters/test/Makefile b/src/std/filters/test/Makefile
index 1c8efd1a1..6442ba332 100644
--- a/src/std/filters/test/Makefile
+++ b/src/std/filters/test/Makefile
@@ -71,6 +71,10 @@ TESTSPEC_vxWorks = filterTestHarness.munch; epicsRunFilterTests
 TESTSPEC_RTEMS = filterTestHarness.boot; epicsRunFilterTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
 
 include $(TOP)/configure/RULES
 
diff --git a/src/std/rec/test/Makefile b/src/std/rec/test/Makefile
index 5619f491a..f5f9b4312 100644
--- a/src/std/rec/test/Makefile
+++ b/src/std/rec/test/Makefile
@@ -119,6 +119,10 @@ TESTSPEC_vxWorks = recordTestHarness.munch; epicsRunRecordTests
 TESTSPEC_RTEMS = recordTestHarness.boot; epicsRunRecordTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
 
 include $(TOP)/configure/RULES