diff --git a/test/lib-src/emacsclient-tests.el b/test/lib-src/emacsclient-tests.el
index 54dd41c5a69..d65f79876db 100644
--- a/test/lib-src/emacsclient-tests.el
+++ b/test/lib-src/emacsclient-tests.el
@@ -30,7 +30,7 @@
 (defconst emacsclient-test-emacs
   (if installation-directory
       (expand-file-name "lib-src/emacsclient" installation-directory)
-    "emacsclient")
+    emacsclient-program-name)
   "The emacsclient binary to test.")
 
 (defmacro emacsclient-test-call-emacsclient (editor)
diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el
index 444c2f99fa7..aa124f099c7 100644
--- a/test/lisp/server-tests.el
+++ b/test/lisp/server-tests.el
@@ -44,7 +44,7 @@ like that, we just skip the test.")
 (defconst server-tests/emacsclient
   (if installation-directory
       (expand-file-name "lib-src/emacsclient" installation-directory)
-    "emacsclient")
+    emacsclient-program-name)
   "The emacsclient binary to test.")
 
 (defmacro server-tests/wait-until (form)