diff --git a/testApp/Makefile b/testApp/Makefile
index 90e0b28..e0fc7aa 100644
--- a/testApp/Makefile
+++ b/testApp/Makefile
@@ -12,18 +12,22 @@ include $(PVDATA_TEST)/pv/Makefile
 include $(PVDATA_TEST)/property/Makefile
 include $(PVDATA_TEST)/copy/Makefile
 
-# The testHarness runs all the test programs in a known working order.
+# pvDataAllTests runs all the test programs in a known working order.
 testHarness_SRCS += pvDataAllTests.c
 
-PROD_vxWorks = vxTestHarness
-vxTestHarness_SRCS += $(testHarness_SRCS)
-TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); pvDataAllTests
+# Name the application pvdTestHarness
+pvdTestHarness_SRCS = $(testHarness_SRCS)
 
+# Build for vxWorks
+PROD_vxWorks += pvdTestHarness
+TESTSPEC_vxWorks = pvdTestHarness.$(MUNCH_SUFFIX); pvDataAllTests
+
+# Build for RTEMS, with harness code & OS configuration
 PROD_RTEMS += pvdTestHarness
-pvdTestHarness_SRCS += rtemsTestHarness.c rtemsConfig.c
-pvdTestHarness_SRCS += $(testHarness_SRCS)
+pvdTestHarness_SRCS_RTEMS = rtemsTestHarness.c rtemsConfig.c
 TESTSPEC_RTEMS = pvdTestHarness.$(MUNCH_SUFFIX); pvDataAllTests
 
+# Build test scripts for hosts
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
 
 include $(TOP)/configure/RULES