diff --git a/testApp/misc/testBitSet.cpp b/testApp/misc/testBitSet.cpp
index a5a2fb3..68504b5 100644
--- a/testApp/misc/testBitSet.cpp
+++ b/testApp/misc/testBitSet.cpp
@@ -15,6 +15,7 @@
 #include <showConstructDestruct.h>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 using namespace epics::pvData;
 
@@ -149,7 +150,8 @@ int main(int argc,char *argv[])
     }
     testGetSetClearFlip();
     testOperators();
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return(0);
 }
 
diff --git a/testApp/misc/testLinkedList.cpp b/testApp/misc/testLinkedList.cpp
index 1e39614..ee00fc0 100644
--- a/testApp/misc/testLinkedList.cpp
+++ b/testApp/misc/testLinkedList.cpp
@@ -18,6 +18,7 @@
 #include <list>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "lock.h"
 #include "timeStamp.h"
@@ -448,7 +449,8 @@ int main(int argc, char *argv[]) {
     testTimeLocked(auxFd);
     testStdListTime(auxFd);
     testStdListTimeLocked(auxFd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return (0);
 }
  
diff --git a/testApp/misc/testMessageQueue.cpp b/testApp/misc/testMessageQueue.cpp
index 5e0e3bd..badf0dd 100644
--- a/testApp/misc/testMessageQueue.cpp
+++ b/testApp/misc/testMessageQueue.cpp
@@ -17,6 +17,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "lock.h"
 #include "timeStamp.h"
@@ -86,7 +87,8 @@ int main(int argc, char *argv[]) {
         auxfd = fopen(auxFileName,"w+");
     }
     testBasic(fd,auxfd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return (0);
 }
  
diff --git a/testApp/misc/testQueue.cpp b/testApp/misc/testQueue.cpp
index c519877..98b726b 100644
--- a/testApp/misc/testQueue.cpp
+++ b/testApp/misc/testQueue.cpp
@@ -17,6 +17,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "lock.h"
 #include "timeStamp.h"
@@ -155,7 +156,8 @@ int main(int argc, char *argv[]) {
         auxfd = fopen(auxFileName,"w+");
     }
     testBasic(fd,auxfd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return (0);
 }
  
diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp
index 29999b1..e1977e1 100644
--- a/testApp/misc/testSerialization.cpp
+++ b/testApp/misc/testSerialization.cpp
@@ -13,6 +13,7 @@
 
 #include <epicsAssert.h>
 
+#include <epicsExit.h>
 #include "pvIntrospect.h"
 #include "pvData.h"
 #include "serialize.h"
@@ -639,7 +640,8 @@ int main(int argc, char *argv[]) {
     delete control;
     delete flusher;
 
-    getShowConstructDestruct()->showDeleteStaticExit(stdout);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(stdout);
     cout<<"\nDone!\n";
 
     return (0);
diff --git a/testApp/misc/testThread.cpp b/testApp/misc/testThread.cpp
index 5c37290..ebbaa83 100644
--- a/testApp/misc/testThread.cpp
+++ b/testApp/misc/testThread.cpp
@@ -18,6 +18,7 @@
 #include <list>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "event.h"
 #include "thread.h"
@@ -115,6 +116,7 @@ int main(int argc, char *argv[]) {
     }
     testBasic(fd);
     testThreadContext(fd,auxFd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return (0);
 }
diff --git a/testApp/misc/testTimer.cpp b/testApp/misc/testTimer.cpp
index 8e69e02..3086bae 100644
--- a/testApp/misc/testTimer.cpp
+++ b/testApp/misc/testTimer.cpp
@@ -17,6 +17,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 #include "timeStamp.h"
 #include "event.h"
 #include "timer.h"
@@ -112,6 +113,7 @@ int main(int argc, char *argv[]) {
     oneDelay = .0;
     twoDelay = .0;
     testBasic(fd,auxfd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return (0);
 }
diff --git a/testApp/property/testProperty.cpp b/testApp/property/testProperty.cpp
index b34032c..269a3cb 100644
--- a/testApp/property/testProperty.cpp
+++ b/testApp/property/testProperty.cpp
@@ -13,6 +13,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "requester.h"
 #include "pvIntrospect.h"
@@ -243,7 +244,8 @@ int main(int argc,char *argv[])
     testDisplay(fd,auxfd);
     testEnumerated(fd,auxfd);
     deleteRecords(fd,auxfd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return(0);
 }
 
diff --git a/testApp/pv/testIntrospect.cpp b/testApp/pv/testIntrospect.cpp
index f43d884..112681e 100644
--- a/testApp/pv/testIntrospect.cpp
+++ b/testApp/pv/testIntrospect.cpp
@@ -13,6 +13,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "requester.h"
 #include "executor.h"
@@ -147,7 +148,8 @@ int main(int argc,char *argv[])
     testScalarArray(fd);
     testSimpleStructure(fd);
     testStructureArray(fd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return(0);
 }
 
diff --git a/testApp/pv/testPVAppend.cpp b/testApp/pv/testPVAppend.cpp
index 5f70523..0d8a88f 100644
--- a/testApp/pv/testPVAppend.cpp
+++ b/testApp/pv/testPVAppend.cpp
@@ -13,6 +13,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "requester.h"
 #include "pvIntrospect.h"
@@ -142,7 +143,8 @@ int main(int argc,char *argv[])
     testAppendSimple(fd);
     testAppendMore(fd);
     testAppends(fd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return(0);
 }
 
diff --git a/testApp/pv/testPVAuxInfo.cpp b/testApp/pv/testPVAuxInfo.cpp
index 2456800..ccb6394 100644
--- a/testApp/pv/testPVAuxInfo.cpp
+++ b/testApp/pv/testPVAuxInfo.cpp
@@ -13,6 +13,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "requester.h"
 #include "pvIntrospect.h"
@@ -92,7 +93,8 @@ int main(int argc,char *argv[])
     standardPVField = getStandardPVField();
     convert = getConvert();
     testPVAuxInfo(fd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return(0);
 }
 
diff --git a/testApp/pv/testPVData.cpp b/testApp/pv/testPVData.cpp
index 744cae8..1effa04 100644
--- a/testApp/pv/testPVData.cpp
+++ b/testApp/pv/testPVData.cpp
@@ -13,6 +13,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "requester.h"
 #include "pvIntrospect.h"
@@ -282,7 +283,8 @@ int main(int argc,char *argv[])
     testAppend(fd);
     testPVScalar(fd);
     testScalarArray(fd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return(0);
 }
 
diff --git a/testApp/pv/testPVStructureArray.cpp b/testApp/pv/testPVStructureArray.cpp
index f27120d..d3f44ff 100644
--- a/testApp/pv/testPVStructureArray.cpp
+++ b/testApp/pv/testPVStructureArray.cpp
@@ -13,6 +13,7 @@
 #include <cstdio>
 
 #include <epicsAssert.h>
+#include <epicsExit.h>
 
 #include "requester.h"
 #include "pvIntrospect.h"
@@ -79,7 +80,8 @@ int main(int argc,char *argv[])
     standardField = getStandardField();
     standardPVField = getStandardPVField();
     testPowerSupplyArray(fd);
-    getShowConstructDestruct()->showDeleteStaticExit(fd);
+    epicsExitCallAtExits();
+    CDRMonitor::get().show(fd);
     return(0);
 }