diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs
index 36dd78dd2b19..d20e79b9db33 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a(b=c)
-// error-pattern: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr
index 1e7922a9ff15..3a12e9786800 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs
index 48d656a4a28d..660d5d1b1ea9 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a{b}
-// error-pattern: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr
index b92e1fd3d97c..2e141137129d 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs
index e7dfa17b4b6c..d8b3c0284cca 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a(b)
-// error-pattern: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr
index 6853a69b9eb2..52685d7b4a23 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs
index 9fa726f93e3e..4a0d116e644b 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a{
-// error-pattern: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr
index 7d2087b4b71f..618d12aba68e 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs
index 1d7fa7885348..7c5531606fa3 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg )
-// error-pattern: invalid `--cfg` argument: `)` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}
diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr
index 7bb1814127b2..16bb552f0d99 100644
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `)` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 
diff --git a/src/test/ui/conditional-compilation/cfg-empty-codemap.rs b/src/test/ui/conditional-compilation/cfg-empty-codemap.rs
index 9e34cacf74d2..c23d2cee924b 100644
--- a/src/test/ui/conditional-compilation/cfg-empty-codemap.rs
+++ b/src/test/ui/conditional-compilation/cfg-empty-codemap.rs
@@ -2,7 +2,7 @@
 
 // compile-flags: --cfg ""
 
-// error-pattern: invalid `--cfg` argument: `""` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `""` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 
 pub fn main() {
 }
diff --git a/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr b/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr
index 128e3cd73068..55e3dc131ae9 100644
--- a/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr
+++ b/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `""` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `""` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")