diff --git a/src/test/codegen/exact_div.rs b/src/test/codegen/intrinsics/exact_div.rs
similarity index 87%
rename from src/test/codegen/exact_div.rs
rename to src/test/codegen/intrinsics/exact_div.rs
index 6a55b492cb1e1..68eaa39997a15 100644
--- a/src/test/codegen/exact_div.rs
+++ b/src/test/codegen/intrinsics/exact_div.rs
@@ -8,13 +8,13 @@ use std::intrinsics::exact_div;
 // CHECK-LABEL: @exact_sdiv
 #[no_mangle]
 pub unsafe fn exact_sdiv(x: i32, y: i32) -> i32 {
-// CHECK: sdiv exact
+    // CHECK: sdiv exact
     exact_div(x, y)
 }
 
 // CHECK-LABEL: @exact_udiv
 #[no_mangle]
 pub unsafe fn exact_udiv(x: u32, y: u32) -> u32 {
-// CHECK: udiv exact
+    // CHECK: udiv exact
     exact_div(x, y)
 }
diff --git a/src/test/codegen/likely.rs b/src/test/codegen/intrinsics/likely.rs
similarity index 100%
rename from src/test/codegen/likely.rs
rename to src/test/codegen/intrinsics/likely.rs
diff --git a/src/test/codegen/move-val-init.rs b/src/test/codegen/intrinsics/move-val-init.rs
similarity index 100%
rename from src/test/codegen/move-val-init.rs
rename to src/test/codegen/intrinsics/move-val-init.rs
diff --git a/src/test/codegen/nontemporal.rs b/src/test/codegen/intrinsics/nontemporal.rs
similarity index 100%
rename from src/test/codegen/nontemporal.rs
rename to src/test/codegen/intrinsics/nontemporal.rs
diff --git a/src/test/codegen/prefetch.rs b/src/test/codegen/intrinsics/prefetch.rs
similarity index 100%
rename from src/test/codegen/prefetch.rs
rename to src/test/codegen/intrinsics/prefetch.rs
diff --git a/src/test/codegen/unchecked_math.rs b/src/test/codegen/intrinsics/unchecked_math.rs
similarity index 100%
rename from src/test/codegen/unchecked_math.rs
rename to src/test/codegen/intrinsics/unchecked_math.rs