diff --git a/testApp/Makefile b/testApp/Makefile
index 348b671..8a254a7 100644
--- a/testApp/Makefile
+++ b/testApp/Makefile
@@ -15,18 +15,22 @@ PROD_LIBS += pvAccess pvData Com
 include $(PVACCESS_TEST)/utils/Makefile
 include $(PVACCESS_TEST)/remote/Makefile
 
-# The testHarness runs all the test programs in a known working order.
+# pvAccessAllTests runs all the test programs in a known working order.
 testHarness_SRCS += pvAccessAllTests.c
 
-PROD_vxWorks = vxTestHarness
-vxTestHarness_SRCS += $(testHarness_SRCS)
-TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); pvAccessAllTests
+# Name the application pvaTestHarness
+pvaTestHarness_SRCS = $(testHarness_SRCS)
 
+# Build for vxWorks
+PROD_vxWorks = pvaTestHarness
+TESTSPEC_vxWorks = pvaTestHarness.$(MUNCH_SUFFIX); pvAccessAllTests
+
+# Build for RTEMS, with harness code & configuration
 PROD_RTEMS += pvaTestHarness
-pvaTestHarness_SRCS += rtemsTestHarness.c rtemsConfig.c
-pvaTestHarness_SRCS += $(testHarness_SRCS)
+pvaTestHarness_SRCS_RTEMS += rtemsTestHarness.c rtemsConfig.c
 TESTSPEC_RTEMS = pvaTestHarness.$(MUNCH_SUFFIX); pvAccessAllTests
 
+# Build test scripts for hosts
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
 
 include $(TOP)/configure/RULES