1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index 654c6bad2d6..6363aa93252 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -1803,11 +1803,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         nodeApp.name = "NodeApp";
         ServerDescriptorPtr server = new ServerDescriptor();
         server->id = "node-1";
-#if defined(NDEBUG) || !defined(_WIN32)
         server->exe = properties->getProperty("IceBinDir") + "/icegridnode";
-#else
-        server->exe = properties->getProperty("IceBinDir") + "/icegridnoded";
-#endif
         server->options.push_back("--nowarn");
         server->pwd = ".";
         server->applicationDistrib = false;
@@ -1859,8 +1855,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         server = new ServerDescriptor();
         server->id = "Server";
-        server->exe = properties->getProperty("TestDir") + "/server";
-        server->pwd = ".";
+        server->exe = properties->getProperty("ServerDir") + "/server";
+        server->pwd = properties->getProperty("TestDir");
+
         server->applicationDistrib = false;
         server->allocatable = false;
         AdapterDescriptor adapter;