diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index a17825a877d88..fe94b62ef19e2 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -868,7 +868,7 @@ impl Session {
                 let fuel = self.optimization_fuel_limit.get();
                 ret = fuel != 0;
                 if fuel == 0 && !self.out_of_fuel.get() {
-                    println!("optimization-fuel-exhausted: {}", msg());
+                    eprintln!("optimization-fuel-exhausted: {}", msg());
                     self.out_of_fuel.set(true);
                 } else if fuel > 0 {
                     self.optimization_fuel_limit.set(fuel - 1);
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 276b7290c2ef0..8a7d4a0174310 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -944,7 +944,7 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
             control.compilation_done.callback = box move |state| {
                 old_callback(state);
                 let sess = state.session;
-                println!("Fuel used by {}: {}",
+                eprintln!("Fuel used by {}: {}",
                     sess.print_fuel_crate.as_ref().unwrap(),
                     sess.print_fuel.get());
             }
diff --git a/src/test/run-pass/optimization-fuel-0.rs b/src/test/run-pass/optimization-fuel-0.rs
index 3832c040108f8..a12dad4489df9 100644
--- a/src/test/run-pass/optimization-fuel-0.rs
+++ b/src/test/run-pass/optimization-fuel-0.rs
@@ -12,7 +12,8 @@
 
 use std::mem::size_of;
 
-// compile-flags: -Z fuel=foo=0
+// (#55495: The --error-format is to sidestep an issue in our test harness)
+// compile-flags: --error-format human -Z fuel=foo=0
 
 struct S1(u8, u16, u8);
 struct S2(u8, u16, u8);
diff --git a/src/test/run-pass/optimization-fuel-0.stdout b/src/test/run-pass/optimization-fuel-0.stderr
similarity index 100%
rename from src/test/run-pass/optimization-fuel-0.stdout
rename to src/test/run-pass/optimization-fuel-0.stderr
diff --git a/src/test/run-pass/optimization-fuel-1.rs b/src/test/run-pass/optimization-fuel-1.rs
index e3529ebfb0d81..1e76aaa48b761 100644
--- a/src/test/run-pass/optimization-fuel-1.rs
+++ b/src/test/run-pass/optimization-fuel-1.rs
@@ -12,7 +12,8 @@
 
 use std::mem::size_of;
 
-// compile-flags: -Z fuel=foo=1
+// (#55495: The --error-format is to sidestep an issue in our test harness)
+// compile-flags: --error-format human -Z fuel=foo=1
 
 struct S1(u8, u16, u8);
 struct S2(u8, u16, u8);
diff --git a/src/test/run-pass/optimization-fuel-1.stdout b/src/test/run-pass/optimization-fuel-1.stderr
similarity index 100%
rename from src/test/run-pass/optimization-fuel-1.stdout
rename to src/test/run-pass/optimization-fuel-1.stderr
diff --git a/src/test/ui/print-fuel/print-fuel.rs b/src/test/ui/print-fuel/print-fuel.rs
index 96b025128ee9a..31123410481c3 100644
--- a/src/test/ui/print-fuel/print-fuel.rs
+++ b/src/test/ui/print-fuel/print-fuel.rs
@@ -11,7 +11,8 @@
 #![crate_name="foo"]
 #![allow(dead_code)]
 
-// compile-flags: -Z print-fuel=foo
+// (#55495: The --error-format is to sidestep an issue in our test harness)
+// compile-flags: --error-format human -Z print-fuel=foo
 // compile-pass
 
 struct S1(u8, u16, u8);
diff --git a/src/test/ui/print-fuel/print-fuel.stdout b/src/test/ui/print-fuel/print-fuel.stderr
similarity index 100%
rename from src/test/ui/print-fuel/print-fuel.stdout
rename to src/test/ui/print-fuel/print-fuel.stderr