diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-closure.rs b/src/test/compile-fail/E0495.rs
similarity index 84%
rename from src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-closure.rs
rename to src/test/compile-fail/E0495.rs
index faf4fe547bf..e47c4d7199c 100644
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-closure.rs
+++ b/src/test/compile-fail/E0495.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// FIXME - This test gives different results on different machines.
 fn invoke<'a, F>(x: &'a i32, f: F) -> &'a i32
 where F: FnOnce(&'a i32, &i32) -> &'a i32
 {
@@ -15,10 +16,8 @@ fn invoke<'a, F>(x: &'a i32, f: F) -> &'a i32
     f(x, &y)
 }
 
-fn foo<'a>(x: &'a i32) {
+fn foo<'a>(x: &'a i32) { //~ ERROR E0495
     invoke(&x, |a, b| if a > b { a } else { b });
 }
 
-fn main() {
-}
-
+fn main() {}
diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-closure.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-closure.stderr
deleted file mode 100644
index 20104afae51..00000000000
--- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-closure.stderr
+++ /dev/null
@@ -1,29 +0,0 @@
-error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
-  --> $DIR/ex1-return-one-existing-name-if-else-using-closure.rs:19:5
-   |
-19 |     invoke(&x, |a, b| if a > b { a } else { b });
-   |     ^^^^^^
-   |
-note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 19:16...
-  --> $DIR/ex1-return-one-existing-name-if-else-using-closure.rs:19:16
-   |
-19 |     invoke(&x, |a, b| if a > b { a } else { b });
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-note: ...so that reference does not outlive borrowed content
-  --> $DIR/ex1-return-one-existing-name-if-else-using-closure.rs:19:45
-   |
-19 |     invoke(&x, |a, b| if a > b { a } else { b });
-   |                                             ^
-note: but, the lifetime must be valid for the expression at 19:5...
-  --> $DIR/ex1-return-one-existing-name-if-else-using-closure.rs:19:5
-   |
-19 |     invoke(&x, |a, b| if a > b { a } else { b });
-   |     ^^^^^^
-note: ...so that a type/lifetime parameter is in scope here
-  --> $DIR/ex1-return-one-existing-name-if-else-using-closure.rs:19:5
-   |
-19 |     invoke(&x, |a, b| if a > b { a } else { b });
-   |     ^^^^^^
-
-error: aborting due to previous error(s)
-