diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index ac0caafce97ab3..8bbc20b48d53eb 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -738,7 +738,7 @@ private String getAlternateTargetSuggestion(String targetName) {
           suggestedTarget == null ? null : String.format("did you mean '%s'?", suggestedTarget);
       String blazeQuerySuggestion =
           String.format(
-              "Tip: use `query %s:*` to see all the targets in that package",
+              "Tip: use `query \"%s:*\"` to see all the targets in that package",
               packageIdentifier.getDisplayForm(mainRepositoryMapping));
       return String.format(
           " (%s)", Joiner.on(" ").skipNulls().join(targetSuggestion, blazeQuerySuggestion));
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 6125f27c825c97..ad0bb8ac6e75a7 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -699,8 +699,8 @@ public void testHelpfulErrorForWrongPackageLabels() throws Exception {
     assertThat(result.hasError()).isTrue();
     assertContainsEvent(
         "no such target '//x:z': target 'z' not declared in package 'x' defined by"
-            + " /workspace/x/BUILD (Tip: use `query //x:*` to see all the targets in that package)"
-            + " and referenced by '//y:y'");
+            + " /workspace/x/BUILD (Tip: use `query \"//x:*\"` to see all the targets in that"
+            + " package) and referenced by '//y:y'");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java b/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java
index b5aeb973c7aea0..34c08ba5ce9b59 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/ExportsFilesTest.java
@@ -62,7 +62,7 @@ public void testFileThatsNotRegisteredYieldsUnknownTargetException() throws Exce
         .isEqualTo(
             "no such target '//pkg:baz.txt': target 'baz.txt' not declared in package 'pkg' "
                 + "defined by /workspace/pkg/BUILD (did you mean 'bar.txt'? Tip: use `query "
-                + "//pkg:*` to see all the targets in that package)");
+                + "\"//pkg:*\"` to see all the targets in that package)");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index d10cc1ee0338a2..81d5aa0278b21d 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -284,8 +284,8 @@ public void testCreationOfInputFiles() throws Exception {
         .hasMessageThat()
         .isEqualTo(
             "no such target '//foo:A': target 'A' not declared in package 'foo' defined by"
-                + " /workspace/foo/BUILD (Tip: use `query //foo:*` to see all the targets in that"
-                + " package)");
+                + " /workspace/foo/BUILD (Tip: use `query \"//foo:*\"` to see all the targets in"
+                + " that package)");
 
     // These are the only input files: BUILD, Z
     Set<String> inputFiles = Sets.newTreeSet();
@@ -423,8 +423,8 @@ public void testHelpfulErrorForMissingExportsFiles() throws Exception {
         .hasMessageThat()
         .isEqualTo(
             "no such target '//x:z.cc': target 'z.cc' not declared in package 'x' defined by"
-                + " /workspace/x/BUILD (did you mean 'x.cc'? Tip: use `query //x:*` to see all the"
-                + " targets in that package)");
+                + " /workspace/x/BUILD (did you mean 'x.cc'? Tip: use `query \"//x:*\"` to see all"
+                + " the targets in that package)");
 
     e = assertThrows(NoSuchTargetException.class, () -> pkg.getTarget("dir"));
     assertThat(e)
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java
index aadf40c1cfe27a..5ab9d27baf5847 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java
@@ -160,8 +160,8 @@ public void testCompileOneDepOnMissingFile() throws Exception {
         .hasMessageThat()
         .isEqualTo(
             "no such target '//foo:missing.cc': target 'missing.cc' not declared in package "
-                + "'foo' defined by /workspace/foo/BUILD (Tip: use `query //foo:*` to see all the "
-                + "targets in that package)");
+                + "'foo' defined by /workspace/foo/BUILD (Tip: use `query \"//foo:*\"` to see all "
+                + "the targets in that package)");
 
     // Also, try a valid input file which has no dependent rules in its package.
     e = assertThrows(TargetParsingException.class, () -> parseCompileOneDep("//foo:baz/bang"));
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
index 7526fa1114e864..4d3d5e997679bd 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageLoadingTest.java
@@ -237,7 +237,7 @@ public void testGetNonexistentTarget() throws Exception {
         .isEqualTo(
             "no such target '//pkg1:not-there': target 'not-there' "
                 + "not declared in package 'pkg1' defined by /workspace/pkg1/BUILD (Tip: use "
-                + "`query //pkg1:*` to see all the targets in that package)");
+                + "`query \"//pkg1:*\"` to see all the targets in that package)");
   }
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java
index f060a8f4b14521..15e34d881d465e 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/AbstractQueryTest.java
@@ -290,7 +290,7 @@ protected final void checkResultOfTargetLiteralWithMissingTargets(
             "no such target '//a:b': target 'b' not declared in package 'a' "
                 + "defined by "
                 + helper.getRootDirectory().getPathString()
-                + "/a/BUILD (Tip: use `query //a:*` to see all the targets in that package)");
+                + "/a/BUILD (Tip: use `query \"//a:*\"` to see all the targets in that package)");
     assertThat(failureDetail.getPackageLoading().getCode())
         .isEqualTo(FailureDetails.PackageLoading.Code.TARGET_MISSING);
   }