diff --git a/testApp/pvAccessAllTests.c b/testApp/pvAccessAllTests.c
index e9a299e..c4932fc 100644
--- a/testApp/pvAccessAllTests.c
+++ b/testApp/pvAccessAllTests.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <epicsThread.h>
 #include <epicsUnitTest.h>
+#include <epicsExit.h>
 
 /* utils */
 int testAtomicBoolean(void);
@@ -31,5 +32,5 @@ void pvAccessAllTests(void)
     runTest(testCodec);
     runTest(testChannelAccess);
 
+    epicsExit(0);   /* Trigger test harness */
 }
-
diff --git a/testApp/rtemsTestHarness.c b/testApp/rtemsTestHarness.c
index 0b22320..d2042f7 100644
--- a/testApp/rtemsTestHarness.c
+++ b/testApp/rtemsTestHarness.c
@@ -5,7 +5,6 @@
 
 #include "rtemsNetworking.h"
 
-#include <epicsExit.h>
 #include <osdTime.h>
 
 rtems_task
@@ -33,5 +32,4 @@ Init (rtems_task_argument ignored)
   
   extern void pvAccessAllTests(void);
   pvAccessAllTests();
-  epicsExit(0);
 }