diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index bcf7c33..1de5bbc 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -48,12 +48,6 @@ doxygen
 
 make runtests
 
-./bin/${EPICS_HOST_ARCH}/testServer &
-./testApp/${EPICS_HOST_ARCH}/testRemoteClientImpl
-
-# Clean up testServer
-kill $!
-
 ###########################################
 # Create distribution
 
diff --git a/testApp/remote/Makefile b/testApp/remote/Makefile
index f5fd000..017b00b 100644
--- a/testApp/remote/Makefile
+++ b/testApp/remote/Makefile
@@ -4,12 +4,12 @@ SRC_DIRS += $(PVACCESS_TEST)/remote
 
 TESTPROD_HOST += testChannelAccess
 testChannelAccess_SRCS = testChannelAccess channelAccessIFTest
-testHarness_SRCS += testChannelAccess.cpp
+testHarness_SRCS += testChannelAccess.cpp channelAccessIFTest.cpp
 TESTS += testChannelAccess
 
 TESTPROD_HOST += testCodec
 testCodec_SRCS = testCodec
-testHarness_SRCS += testChannelAccess.cpp
+testHarness_SRCS += testCodec.cpp
 TESTS += testCodec
 
 
diff --git a/testApp/remote/testChannelAccess.cpp b/testApp/remote/testChannelAccess.cpp
index 9440041..1c73be3 100755
--- a/testApp/remote/testChannelAccess.cpp
+++ b/testApp/remote/testChannelAccess.cpp
@@ -6,6 +6,10 @@
 #define NOMINMAX
 #endif
 
+// TODO not nice
+// disable buggy boost enable_shared_from_this assert code
+#define BOOST_DISABLE_ASSERTS
+
 #define TESTSERVERNOMAIN
 
 #include <epicsExit.h>
diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp
index fa9fd91..4284eed 100644
--- a/testApp/remote/testServer.cpp
+++ b/testApp/remote/testServer.cpp
@@ -6,6 +6,10 @@
 #define NOMINMAX
 #endif
 
+// TODO not nice
+// disable buggy boost enable_shared_from_this assert code
+#define BOOST_DISABLE_ASSERTS
+
 #include <pv/serverContext.h>
 #include <pv/clientContextImpl.h>
 #include <epicsExit.h>
@@ -25,7 +29,6 @@
 // TODO temp
 #include "testADCSim.cpp"
 
-
 using namespace epics::pvAccess;
 using namespace epics::pvData;
 using namespace std;