diff --git a/documentation/release_notes.dox b/documentation/release_notes.dox
index 951e94b..63d867e 100644
--- a/documentation/release_notes.dox
+++ b/documentation/release_notes.dox
@@ -7,6 +7,8 @@ Release 6.1.0 (UNRELEASED)
  - pv/namedLockPattern.h
  - createFileLogger() from pv/logger.h
 - Removals
+ - No longer install testServer, testGetPerformance, testMonitorPerformance, rpcServiceExample, rpcServiceAsyncExample, rpcWildServiceExample, rpcClientExample, and pipelineServiceExample.
+   These will continue to be built, and may be found under testApp/O.* .
  - The @b eget CLI utility has moved to https://github.com/epics-base/eget
    The new @b pvcall and existing pvget replace its role as a low level troubleshooting tool.
  - Remove deprecated methods configure(), flush(), and poll() from ChannelProvider.
diff --git a/testApp/remote/Makefile b/testApp/remote/Makefile
index 4f15079..5d9e805 100644
--- a/testApp/remote/Makefile
+++ b/testApp/remote/Makefile
@@ -35,28 +35,28 @@ TESTPROD_HOST += testsharedstate
 testsharedstate_SRCS += testsharedstate.cpp
 TESTS += testsharedstate
 
-PROD_HOST += testServer
+TESTPROD_HOST += testServer
 testServer_SRCS += testServer.cpp
 
-PROD_HOST += testGetPerformance
+TESTPROD_HOST += testGetPerformance
 testGetPerformance_SRCS += testGetPerformance.cpp
 
-PROD_HOST += testMonitorPerformance
+TESTPROD_HOST += testMonitorPerformance
 testMonitorPerformance_SRCS += testMonitorPerformance.cpp
 
-PROD_HOST += rpcServiceExample
+TESTPROD_HOST += rpcServiceExample
 rpcServiceExample_SRCS += rpcServiceExample.cpp
 
-PROD_HOST += rpcServiceAsyncExample
+TESTPROD_HOST += rpcServiceAsyncExample
 rpcServiceAsyncExample_SRCS += rpcServiceAsyncExample.cpp
 
-PROD_HOST += rpcWildServiceExample
+TESTPROD_HOST += rpcWildServiceExample
 rpcWildServiceExample_SRCS += rpcWildServiceExample.cpp
 
-PROD_HOST += rpcClientExample
+TESTPROD_HOST += rpcClientExample
 rpcClientExample_SRCS += rpcClientExample.cpp
 
-PROD_HOST += pipelineServiceExample
+TEESTPROD_HOST += pipelineServiceExample
 pipelineServiceExample_SRCS += pipelineServiceExample.cpp
 
 TESTPROD_HOST += testClientFactory