1 files changed, 5 insertions, 7 deletions
diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp
index 651cc31883b..8e351d2d574 100644
--- a/cpp/test/Glacier2/override/Client.cpp
+++ b/cpp/test/Glacier2/override/Client.cpp
@@ -17,9 +17,6 @@ using namespace std;
 using namespace Ice;
 using namespace Test;
 
-static Ice::InitializationData initData;
-
-
 class CallbackClient : public Application
 {
 public:
@@ -39,7 +36,7 @@ main(int argc, char* argv[])
     // the router before session establishment, as well as after
     // session destruction. Both will cause a ConnectionLostException.
     //
-    initData.properties = Ice::createProperties(argc, argv);
+    Ice::InitializationData initData = getTestInitData(argc, argv);
     initData.properties->setProperty("Ice.Warn.Connections", "0");
     initData.properties->setProperty("Ice.ThreadPool.Client.Serialize", "1");
 
@@ -50,11 +47,11 @@ main(int argc, char* argv[])
 int
 CallbackClient::run(int, char**)
 {
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347");
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     communicator()->setDefaultRouter(router);
 
-    ObjectPrx base = communicator()->stringToProxy("c/callback:tcp -p 12010");
+    ObjectPrx base = communicator()->stringToProxy("c/callback:" + getTestEndpoint(communicator(), 0));
     Glacier2::SessionPrx session = router->createSession("userid", "abc123");
     base->ice_ping();
 
@@ -213,7 +210,8 @@ CallbackClient::run(int, char**)
         }
 
         communicator()->setDefaultRouter(0);
-        ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348");
+        ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
+                                                              getTestEndpoint(communicator(), 11, "tcp"));
         Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
         process->shutdown();
         try