diff --git a/testApp/pvDataAllTests.c b/testApp/pvDataAllTests.c
index ca43a0b..0a07c83 100644
--- a/testApp/pvDataAllTests.c
+++ b/testApp/pvDataAllTests.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <epicsThread.h>
 #include <epicsUnitTest.h>
+#include <epicsExit.h>
 
 /* copy */
 int testCreateRequest(void);
@@ -84,5 +85,6 @@ void pvDataAllTests(void)
 
     /* property */
     runTest(testCreateRequest);
-}
 
+    epicsExit(0);   /* Trigger test harness */
+}
diff --git a/testApp/rtemsTestHarness.c b/testApp/rtemsTestHarness.c
index 445917e..0ca6ed3 100644
--- a/testApp/rtemsTestHarness.c
+++ b/testApp/rtemsTestHarness.c
@@ -9,7 +9,6 @@
 
 #include "rtemsNetworking.h"
 
-#include <epicsExit.h>
 #include <osdTime.h>
 
 rtems_task
@@ -37,5 +36,4 @@ Init (rtems_task_argument ignored)
   
   extern void pvDataAllTests(void);
   pvDataAllTests();
-  epicsExit(0);
 }