diff --git a/tests/ui/issues/issue-17546.rs b/tests/ui/variants/variant-result-noresult-used-as-type.rs
similarity index 94%
rename from tests/ui/issues/issue-17546.rs
rename to tests/ui/variants/variant-result-noresult-used-as-type.rs
index 1f0afc368a2eb..14433c1460ebb 100644
--- a/tests/ui/issues/issue-17546.rs
+++ b/tests/ui/variants/variant-result-noresult-used-as-type.rs
@@ -1,5 +1,6 @@
 //@ edition:2015
 //@ ignore-sgx std::os::fortanix_sgx::usercalls::raw::Result changes compiler suggestions
+// https://github.com/rust-lang/rust/issues/17546
 
 use foo::MyEnum::Result;
 use foo::NoResult; // Through a re-export
diff --git a/tests/ui/issues/issue-17546.stderr b/tests/ui/variants/variant-result-noresult-used-as-type.stderr
similarity index 89%
rename from tests/ui/issues/issue-17546.stderr
rename to tests/ui/variants/variant-result-noresult-used-as-type.stderr
index d4aa354491fe1..511cb3562f947 100644
--- a/tests/ui/issues/issue-17546.stderr
+++ b/tests/ui/variants/variant-result-noresult-used-as-type.stderr
@@ -1,5 +1,5 @@
 error[E0573]: expected type, found variant `NoResult`
-  --> $DIR/issue-17546.rs:15:17
+  --> $DIR/variant-result-noresult-used-as-type.rs:16:17
    |
 LL |     fn new() -> NoResult<MyEnum, String> {
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -19,7 +19,7 @@ LL +     fn new() -> Result<MyEnum, String> {
    |
 
 error[E0573]: expected type, found variant `Result`
-  --> $DIR/issue-17546.rs:25:17
+  --> $DIR/variant-result-noresult-used-as-type.rs:26:17
    |
 LL |     fn new() -> Result<foo::MyEnum, String> {
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@@ -36,7 +36,7 @@ LL +     use std::thread::Result;
    |
 
 error[E0573]: expected type, found variant `Result`
-  --> $DIR/issue-17546.rs:31:13
+  --> $DIR/variant-result-noresult-used-as-type.rs:32:13
    |
 LL | fn new() -> Result<foo::MyEnum, String> {
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@@ -53,7 +53,7 @@ LL + use std::thread::Result;
    |
 
 error[E0573]: expected type, found variant `NoResult`
-  --> $DIR/issue-17546.rs:36:15
+  --> $DIR/variant-result-noresult-used-as-type.rs:37:15
    |
 LL | fn newer() -> NoResult<foo::MyEnum, String> {
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^