diff --git a/src/test/ui/simd-type.rs b/src/test/ui/simd-type.rs
deleted file mode 100644
index 87df26434d7..00000000000
--- a/src/test/ui/simd-type.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-#![feature(repr_simd)]
-#![allow(non_camel_case_types)]
-
-// ignore-tidy-linelength
-
-#[repr(simd)]
-struct empty; //~ ERROR SIMD vector cannot be empty
-
-#[repr(simd)]
-struct empty2([f32; 0]); //~ ERROR SIMD vector cannot be empty
-
-#[repr(simd)]
-struct pow2([f32; 7]); //~ ERROR SIMD vector length must be a power of two
-
-#[repr(simd)]
-struct i64f64(i64, f64); //~ ERROR SIMD vector should be homogeneous
-
-struct Foo;
-
-#[repr(simd)]
-struct FooV(Foo, Foo); //~ ERROR SIMD vector element type should be a primitive scalar (integer/float/pointer) type
-
-#[repr(simd)]
-struct FooV2([Foo; 2]); //~ ERROR SIMD vector element type should be a primitive scalar (integer/float/pointer) type
-
-#[repr(simd)]
-struct TooBig([f32; 65536]); //~ ERROR SIMD vector cannot have more than 32768 elements
-
-#[repr(simd)]
-struct JustRight([u128; 32768]);
-
-fn main() {}
diff --git a/src/test/ui/issues/issue-17170.rs b/src/test/ui/simd/issue-17170.rs
similarity index 100%
rename from src/test/ui/issues/issue-17170.rs
rename to src/test/ui/simd/issue-17170.rs
diff --git a/src/test/ui/issues/issue-17170.stderr b/src/test/ui/simd/issue-17170.stderr
similarity index 100%
rename from src/test/ui/issues/issue-17170.stderr
rename to src/test/ui/simd/issue-17170.stderr
diff --git a/src/test/ui/issues/issue-39720.rs b/src/test/ui/simd/issue-39720.rs
similarity index 100%
rename from src/test/ui/issues/issue-39720.rs
rename to src/test/ui/simd/issue-39720.rs
diff --git a/src/test/ui/issues/issue-39720.stderr b/src/test/ui/simd/issue-39720.stderr
similarity index 100%
rename from src/test/ui/issues/issue-39720.stderr
rename to src/test/ui/simd/issue-39720.stderr
diff --git a/src/test/ui/simd-type-generic-monomorphisation-empty.rs b/src/test/ui/simd/simd-type-generic-monomorphisation-empty.rs
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation-empty.rs
rename to src/test/ui/simd/simd-type-generic-monomorphisation-empty.rs
diff --git a/src/test/ui/simd-type-generic-monomorphisation-empty.stderr b/src/test/ui/simd/simd-type-generic-monomorphisation-empty.stderr
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation-empty.stderr
rename to src/test/ui/simd/simd-type-generic-monomorphisation-empty.stderr
diff --git a/src/test/ui/simd-type-generic-monomorphisation-oversized.rs b/src/test/ui/simd/simd-type-generic-monomorphisation-oversized.rs
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation-oversized.rs
rename to src/test/ui/simd/simd-type-generic-monomorphisation-oversized.rs
diff --git a/src/test/ui/simd-type-generic-monomorphisation-oversized.stderr b/src/test/ui/simd/simd-type-generic-monomorphisation-oversized.stderr
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation-oversized.stderr
rename to src/test/ui/simd/simd-type-generic-monomorphisation-oversized.stderr
diff --git a/src/test/ui/simd-type-generic-monomorphisation-power-of-two.rs b/src/test/ui/simd/simd-type-generic-monomorphisation-power-of-two.rs
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation-power-of-two.rs
rename to src/test/ui/simd/simd-type-generic-monomorphisation-power-of-two.rs
diff --git a/src/test/ui/simd-type-generic-monomorphisation-power-of-two.stderr b/src/test/ui/simd/simd-type-generic-monomorphisation-power-of-two.stderr
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation-power-of-two.stderr
rename to src/test/ui/simd/simd-type-generic-monomorphisation-power-of-two.stderr
diff --git a/src/test/ui/simd-type-generic-monomorphisation.rs b/src/test/ui/simd/simd-type-generic-monomorphisation.rs
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation.rs
rename to src/test/ui/simd/simd-type-generic-monomorphisation.rs
diff --git a/src/test/ui/simd-type-generic-monomorphisation.stderr b/src/test/ui/simd/simd-type-generic-monomorphisation.stderr
similarity index 100%
rename from src/test/ui/simd-type-generic-monomorphisation.stderr
rename to src/test/ui/simd/simd-type-generic-monomorphisation.stderr
diff --git a/src/test/ui/simd/simd-type.rs b/src/test/ui/simd/simd-type.rs
index e7b9bfe32f8..cc7443d0485 100644
--- a/src/test/ui/simd/simd-type.rs
+++ b/src/test/ui/simd/simd-type.rs
@@ -1,9 +1,33 @@
-// run-pass
-#![allow(dead_code)]
-
-// pretty-expanded FIXME #23616
-
 #![feature(repr_simd)]
+#![allow(non_camel_case_types)]
+
+// ignore-tidy-linelength
+
+#[repr(simd)]
+struct empty; //~ ERROR SIMD vector cannot be empty
+
+#[repr(simd)]
+struct empty2([f32; 0]); //~ ERROR SIMD vector cannot be empty
+
+#[repr(simd)]
+struct pow2([f32; 7]); //~ ERROR SIMD vector length must be a power of two
+
+#[repr(simd)]
+struct i64f64(i64, f64); //~ ERROR SIMD vector should be homogeneous
+
+struct Foo;
+
+#[repr(simd)]
+struct FooV(Foo, Foo); //~ ERROR SIMD vector element type should be a primitive scalar (integer/float/pointer) type
+
+#[repr(simd)]
+struct FooV2([Foo; 2]); //~ ERROR SIMD vector element type should be a primitive scalar (integer/float/pointer) type
+
+#[repr(simd)]
+struct TooBig([f32; 65536]); //~ ERROR SIMD vector cannot have more than 32768 elements
+
+#[repr(simd)]
+struct JustRight([u128; 32768]);
 
 #[repr(simd)]
 struct RGBA {
@@ -13,4 +37,4 @@ struct RGBA {
     a: f32
 }
 
-pub fn main() {}
+fn main() {}
diff --git a/src/test/ui/simd-type.stderr b/src/test/ui/simd/simd-type.stderr
similarity index 100%
rename from src/test/ui/simd-type.stderr
rename to src/test/ui/simd/simd-type.stderr