diff --git a/tests/functional/misc.sh b/tests/functional/misc.sh
index 7d63756b7..cb4d4139f 100755
--- a/tests/functional/misc.sh
+++ b/tests/functional/misc.sh
@@ -11,7 +11,7 @@ source common.sh
 #nix-hash --help | grepQuiet base32
 
 # Can we ask for the version number?
-nix-env --version | grep "$version"
+nix-env --version | grep -F "${_NIX_TEST_CLIENT_VERSION:-$version}"
 
 nix_env=$(type -P nix-env)
 (PATH=""; ! $nix_env --help 2>&1 ) | grepQuiet -F "The 'man' command was not found, but it is needed for 'nix-env' and some other 'nix-*' commands' help text. Perhaps you could install the 'man' command?"
diff --git a/tests/functional/package.nix b/tests/functional/package.nix
index 64ffa540a..a84ad1791 100644
--- a/tests/functional/package.nix
+++ b/tests/functional/package.nix
@@ -99,6 +99,8 @@ mkMesonDerivation (
 
   }
   // lib.optionalAttrs (test-daemon != null) {
+    # TODO rename to _NIX_TEST_DAEMON_PACKAGE
     NIX_DAEMON_PACKAGE = test-daemon;
+    _NIX_TEST_CLIENT_VERSION = nix-cli.version;
   }
 )