diff --git a/modules/database/test/std/link/Makefile b/modules/database/test/std/link/Makefile
index 2563fd591..fca089966 100644
--- a/modules/database/test/std/link/Makefile
+++ b/modules/database/test/std/link/Makefile
@@ -47,6 +47,8 @@ testHarness_SRCS += epicsRunLinkTests.c
 linkTestHarness_SRCS += $(testHarness_SRCS)
 linkTestHarness_SRCS_RTEMS += rtemsTestHarness.c
 
+PROD_SRCS_RTEMS += rtemsTestData.c
+
 PROD_vxWorks = linkTestHarness
 PROD_RTEMS = linkTestHarness
 
@@ -54,9 +56,16 @@ TESTSPEC_vxWorks = linkTestHarness.munch; epicsRunLinkTests
 TESTSPEC_RTEMS = linkTestHarness.boot; epicsRunLinkTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),)
+  TESTPROD = $(TESTPROD_HOST)
+  TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
 
 include $(TOP)/configure/RULES
 
 ioRecord$(DEP): $(COMMON_DIR)/ioRecord.h
 lnkStateTest$(DEP): $(COMMON_DIR)/ioRecord.h
 lnkCalcTest$(DEP): $(COMMON_DIR)/ioRecord.h
+
+rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl
+	$(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES)
diff --git a/modules/database/test/std/link/lnkCalcTest.c b/modules/database/test/std/link/lnkCalcTest.c
index 5297a53c5..b573e345d 100644
--- a/modules/database/test/std/link/lnkCalcTest.c
+++ b/modules/database/test/std/link/lnkCalcTest.c
@@ -157,7 +157,7 @@ static void testCalc()
 
 MAIN(lnkCalcTest)
 {
-    testPlan(0);
+    testPlan(30);
 
     testCalc();