diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3c077d55de915b94c318a7c1e39fa11e5453d612..2d22c7d2b154821fcfedcccc6a1d8e5cafc2674a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -66,3 +66,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/trans_sync_across_mixed_cluster_test.
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/distributed-transactions-test.py ${CMAKE_CURRENT_BINARY_DIR}/distributed-transactions-test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/restart-scenarios-test.py ${CMAKE_CURRENT_BINARY_DIR}/restart-scenarios-test.py COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testUtils.py ${CMAKE_CURRENT_BINARY_DIR}/testUtils.py COPYONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosiod_run_test.py ${CMAKE_CURRENT_BINARY_DIR}/eosiod_run_test.py COPYONLY)
diff --git a/tests/eosd_run_test.py b/tests/eosiod_run_test.py
similarity index 100%
rename from tests/eosd_run_test.py
rename to tests/eosiod_run_test.py
diff --git a/tests/testUtils.py b/tests/testUtils.py
index a7060425204b4b7811080f4e6ea829945b40a066..b3d169a781396632dd4e7da0604a045cc6ba655c 100755
--- a/tests/testUtils.py
+++ b/tests/testUtils.py
@@ -20,9 +20,10 @@ import json
 class Utils:
     Debug=False
     FNull = open(os.devnull, 'w')
-    EosClientPath="programs/eosc/eosc"
-    EosWalletPath="programs/eos-walletd/eos-walletd"
-    EosServerPath="programs/eosiod/eosiod"
+    EosClientPath="programs/eosioc/eosioc"
+    EosWalletPath="programs/eosio-walletd/eosio-walletd"
+    EosServerName="eosiod"
+    EosServerPath="programs/eosiod/%s" % (EosServerName)
     EosLauncherPath="programs/launcher/launcher"
     
     @staticmethod
@@ -813,7 +814,7 @@ class Cluster(object):
             Utils.EosLauncherPath, pnodes, total_nodes, topo, delay)
         cmdArr=cmd.split()
         if not self.walletd:
-            cmdArr.append("--eosd")
+            cmdArr.append("--eosiod")
             cmdArr.append("--plugin eosio::wallet_api_plugin")
         Utils.Print("cmd: ", cmdArr)
         if 0 != subprocess.call(cmdArr):
@@ -1169,7 +1170,7 @@ class Cluster(object):
         nodes=[]
 
         try:
-            cmd="pgrep -a eosd"
+            cmd="pgrep -a %s" % (Utils.EosServerName)
             Utils.Debug and Utils.Print("cmd: %s" % (cmd))
             psOut=subprocess.check_output(cmd.split()).decode("utf-8")
             #Utils.Print("psOut: <%s>" % psOut)