diff --git a/compiler/rustc_middle/src/ty/query/plumbing.rs b/compiler/rustc_middle/src/ty/query/plumbing.rs
index 451ed6506f48..17eb8dbdca9c 100644
--- a/compiler/rustc_middle/src/ty/query/plumbing.rs
+++ b/compiler/rustc_middle/src/ty/query/plumbing.rs
@@ -127,6 +127,9 @@ impl<'tcx> TyCtxt<'tcx> {
     pub fn try_print_query_stack(handler: &Handler, num_frames: Option<usize>) {
         eprintln!("query stack during panic:");
 
+        if num_frames != None {
+            eprintln!("we're just showing a limited slice of the query stack");
+        }
         // Be careful reyling on global state here: this code is called from
         // a panic hook, which means that the global `Handler` may be in a weird
         // state if it was responsible for triggering the panic.
diff --git a/src/test/ui/pattern/const-pat-ice.stderr b/src/test/ui/pattern/const-pat-ice.stderr
index 90497db519c3..436958d210a9 100644
--- a/src/test/ui/pattern/const-pat-ice.stderr
+++ b/src/test/ui/pattern/const-pat-ice.stderr
@@ -12,6 +12,7 @@ note: rustc VERSION running on TARGET
 note: compiler flags: FLAGS
 
 query stack during panic:
+we're just showing a limited slice of the query stack
 #0 [check_match] match-checking `main`
 #1 [analysis] running analysis passes on this crate
 we're just showing a limited slice of the query stack
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr b/src/test/ui/proc-macro/invalid-punct-ident-1.stderr
index 9948670b691f..edfb977f7ae6 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr
+++ b/src/test/ui/proc-macro/invalid-punct-ident-1.stderr
@@ -1,4 +1,5 @@
 query stack during panic:
+we're just showing a limited slice of the query stack
 end of query stack
 error: proc macro panicked
   --> $DIR/invalid-punct-ident-1.rs:19:1
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr b/src/test/ui/proc-macro/invalid-punct-ident-2.stderr
index 55f7344e2e6f..ea17175253f5 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr
+++ b/src/test/ui/proc-macro/invalid-punct-ident-2.stderr
@@ -1,4 +1,5 @@
 query stack during panic:
+we're just showing a limited slice of the query stack
 end of query stack
 error: proc macro panicked
   --> $DIR/invalid-punct-ident-2.rs:19:1
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr b/src/test/ui/proc-macro/invalid-punct-ident-3.stderr
index 915720482de6..d60afd12095e 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr
+++ b/src/test/ui/proc-macro/invalid-punct-ident-3.stderr
@@ -1,4 +1,5 @@
 query stack during panic:
+we're just showing a limited slice of the query stack
 end of query stack
 error: proc macro panicked
   --> $DIR/invalid-punct-ident-3.rs:19:1