3 files changed, 11 insertions, 1 deletions
diff --git a/tests/functional/legacy-ssh-store.sh b/tests/functional/legacy-ssh-store.sh
index 71b716b84..a75d55f34 100644
--- a/tests/functional/legacy-ssh-store.sh
+++ b/tests/functional/legacy-ssh-store.sh
@@ -1,4 +1,9 @@
 source common.sh
 
+store_uri="ssh://localhost?remote-store=$TEST_ROOT/other-store"
+
 # Check that store ping trusted doesn't yet work with ssh://
-nix --store ssh://localhost?remote-store=$TEST_ROOT/other-store store ping --json | jq -e 'has("trusted") | not'
+nix --store "$store_uri" store ping --json | jq -e 'has("trusted") | not'
+
+# Suppress grumpiness about multiple nixes on PATH
+(nix --store "$store_uri" doctor || true) 2>&1 | grep 'You are unknown trust'
diff --git a/tests/functional/local-store.sh b/tests/functional/local-store.sh
index 89502f864..e3f0d771c 100644
--- a/tests/functional/local-store.sh
+++ b/tests/functional/local-store.sh
@@ -20,3 +20,6 @@ PATH3=$(nix path-info --store "local?root=$PWD/x" $CORRECT_PATH)
 
 # Ensure store ping trusted works with local store
 nix --store ./x store ping --json | jq -e '.trusted'
+
+# Suppress grumpiness about multiple nixes on PATH
+(nix --store ./x doctor || true) 2>&1 | grep 'You are trusted by'
diff --git a/tests/functional/remote-store.sh b/tests/functional/remote-store.sh
index 7649964ef..856622e79 100644
--- a/tests/functional/remote-store.sh
+++ b/tests/functional/remote-store.sh
@@ -13,6 +13,8 @@ startDaemon
 if isDaemonNewer "2.15pre0"; then
     # Ensure that ping works trusted with new daemon
     nix store ping --json | jq -e '.trusted'
+    # Suppress grumpiness about multiple nixes on PATH
+    (nix doctor || true) 2>&1 | grep 'You are trusted by'
 else
     # And the the field is absent with the old daemon
     nix store ping --json | jq -e 'has("trusted") | not'