diff --git a/testApp/remote/testChannelAccess.cpp b/testApp/remote/testChannelAccess.cpp
index 1261872..3e343ba 100755
--- a/testApp/remote/testChannelAccess.cpp
+++ b/testApp/remote/testChannelAccess.cpp
@@ -12,8 +12,7 @@
 
 #define TESTSERVERNOMAIN
 
-#include <stdlib.h>
-
+#include <envDefs.h>
 #include <epicsExit.h>
 #include <epicsUnitTest.h>
 #include <testMain.h>
@@ -95,8 +94,9 @@ class ChannelAccessIFRemoteTest: public ChannelAccessIFTest  {
 
 MAIN(testChannelAccess)
 {
-  putenv(const_cast<char*>("EPICS_PVA_ADDR_LIST=127.0.0.1"));
-  putenv(const_cast<char*>("EPICS_PVA_AUTO_ADDR_LIST=0"));
+  // note: this leaks memory (uses putenv)
+  epicsEnvSet("EPICS_PVA_ADDR_LIST", "127.0.0.1");
+  epicsEnvSet("EPICS_PVA_AUTO_ADDR_LIST", "0");
 
   SET_LOG_LEVEL(logLevelError);
   ChannelAccessIFRemoteTest caRemoteTest;