diff --git a/src/test/compile-fail/issue-35675.rs b/src/test/compile-fail/issue-35675.rs
new file mode 100644
index 0000000000000..f990c2c42fe14
--- /dev/null
+++ b/src/test/compile-fail/issue-35675.rs
@@ -0,0 +1,67 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+enum Fruit {
+    Apple(i64),
+    //~^ HELP there is an enum variant `Fruit::Apple`, did you mean to use `Fruit`?
+    //~| HELP there is an enum variant `Fruit::Apple`, did you mean to use `Fruit`?
+    Orange(i64),
+}
+
+fn should_return_fruit() -> Apple {
+    //~^ ERROR cannot find type `Apple` in this scope
+    //~| NOTE not found in this scope
+    Apple(5)
+    //~^ ERROR cannot find function `Apple` in this scope
+    //~| NOTE not found in this scope
+    //~| HELP possible candidate is found in another module, you can import it into scope
+}
+
+fn should_return_fruit_too() -> Fruit::Apple {
+    //~^ ERROR expected type, found variant `Fruit::Apple`
+    //~| NOTE not a type
+    Apple(5)
+    //~^ ERROR cannot find function `Apple` in this scope
+    //~| NOTE not found in this scope
+    //~| HELP possible candidate is found in another module, you can import it into scope
+}
+
+fn foo() -> Ok {
+    //~^ ERROR expected type, found variant `Ok`
+    //~| NOTE not a type
+    //~| HELP there is an enum variant
+    //~| HELP there is an enum variant
+    Ok(())
+}
+
+fn bar() -> Variant3 {
+    //~^ ERROR cannot find type `Variant3` in this scope
+    //~| NOTE not found in this scope
+}
+
+fn qux() -> Some {
+    //~^ ERROR expected type, found variant `Some`
+    //~| NOTE not a type
+    //~| HELP there is an enum variant
+    //~| HELP there is an enum variant
+    Some(1)
+}
+
+fn main() {}
+
+mod x {
+    enum Enum {
+        Variant1,
+        Variant2(),
+        Variant3(usize),
+        //~^ HELP there is an enum variant `x::Enum::Variant3`, did you mean to use `x::Enum`?
+        Variant4 {},
+    }
+}
diff --git a/src/test/ui/did_you_mean/issue-35675.rs b/src/test/ui/did_you_mean/issue-35675.rs
deleted file mode 100644
index ff29f3ad4078b..0000000000000
--- a/src/test/ui/did_you_mean/issue-35675.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-enum Fruit {
-    Apple(i64),
-    Orange(i64),
-}
-
-fn should_return_fruit() -> Apple {
-    Apple(5)
-}
-
-fn should_return_fruit_too() -> Fruit::Apple {
-    Apple(5)
-}
-
-fn foo() -> Ok {
-    Ok(())
-}
-
-fn bar() -> Variant3 {
-}
-
-fn qux() -> Some {
-    Some(1)
-}
-
-fn main() {}
-
-mod x {
-    enum Enum {
-        Variant1,
-        Variant2(),
-        Variant3(usize),
-        Variant4 {},
-    }
-}
diff --git a/src/test/ui/did_you_mean/issue-35675.stderr b/src/test/ui/did_you_mean/issue-35675.stderr
deleted file mode 100644
index 3d615785b25fa..0000000000000
--- a/src/test/ui/did_you_mean/issue-35675.stderr
+++ /dev/null
@@ -1,74 +0,0 @@
-error[E0412]: cannot find type `Apple` in this scope
-  --> $DIR/issue-35675.rs:16:29
-   |
-16 | fn should_return_fruit() -> Apple {
-   |                             ^^^^^ not found in this scope
-   |
-help: there is an enum variant `Fruit::Apple`, did you mean to use `Fruit`?
-  --> $DIR/issue-35675.rs:12:5
-   |
-12 |     Apple(i64),
-   |     ^^^^^^^^^^
-
-error[E0425]: cannot find function `Apple` in this scope
-  --> $DIR/issue-35675.rs:17:5
-   |
-17 |     Apple(5)
-   |     ^^^^^ not found in this scope
-   |
-   = help: possible candidate is found in another module, you can import it into scope:
-             `use Fruit::Apple;`
-
-error[E0573]: expected type, found variant `Fruit::Apple`
-  --> $DIR/issue-35675.rs:20:33
-   |
-20 | fn should_return_fruit_too() -> Fruit::Apple {
-   |                                 ^^^^^^^^^^^^ not a type
-   |
-help: there is an enum variant `Fruit::Apple`, did you mean to use `Fruit`?
-  --> $DIR/issue-35675.rs:12:5
-   |
-12 |     Apple(i64),
-   |     ^^^^^^^^^^
-
-error[E0425]: cannot find function `Apple` in this scope
-  --> $DIR/issue-35675.rs:21:5
-   |
-21 |     Apple(5)
-   |     ^^^^^ not found in this scope
-   |
-   = help: possible candidate is found in another module, you can import it into scope:
-             `use Fruit::Apple;`
-
-error[E0573]: expected type, found variant `Ok`
-  --> $DIR/issue-35675.rs:24:13
-   |
-24 | fn foo() -> Ok {
-   |             ^^ not a type
-   |
-   = help: there is an enum variant `std::prelude::v1::Ok`, did you mean to use `std::prelude::v1`?
-   = help: there is an enum variant `std::prelude::v1::Result::Ok`, did you mean to use `std::prelude::v1::Result`?
-
-error[E0412]: cannot find type `Variant3` in this scope
-  --> $DIR/issue-35675.rs:28:13
-   |
-28 | fn bar() -> Variant3 {
-   |             ^^^^^^^^ not found in this scope
-   |
-help: there is an enum variant `x::Enum::Variant3`, did you mean to use `x::Enum`?
-  --> $DIR/issue-35675.rs:41:9
-   |
-41 |         Variant3(usize),
-   |         ^^^^^^^^^^^^^^^
-
-error[E0573]: expected type, found variant `Some`
-  --> $DIR/issue-35675.rs:31:13
-   |
-31 | fn qux() -> Some {
-   |             ^^^^ not a type
-   |
-   = help: there is an enum variant `std::prelude::v1::Option::Some`, did you mean to use `std::prelude::v1::Option`?
-   = help: there is an enum variant `std::prelude::v1::Some`, did you mean to use `std::prelude::v1`?
-
-error: aborting due to 7 previous errors
-