diff --git a/src/test/codegen/simd-intrinsic-float-abs.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-abs.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-abs.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-abs.rs
diff --git a/src/test/codegen/simd-intrinsic-float-ceil.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-ceil.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-ceil.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-ceil.rs
diff --git a/src/test/codegen/simd-intrinsic-float-cos.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-cos.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-cos.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-cos.rs
diff --git a/src/test/codegen/simd-intrinsic-float-exp.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-exp.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp.rs
diff --git a/src/test/codegen/simd-intrinsic-float-exp2.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp2.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-exp2.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-exp2.rs
diff --git a/src/test/codegen/simd-intrinsic-float-floor.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-floor.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-floor.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-floor.rs
diff --git a/src/test/codegen/simd-intrinsic-float-fma.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-fma.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-fma.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-fma.rs
diff --git a/src/test/codegen/simd-intrinsic-float-fsqrt.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-fsqrt.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-fsqrt.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-fsqrt.rs
diff --git a/src/test/codegen/simd-intrinsic-float-log.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-log.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-log.rs
diff --git a/src/test/codegen/simd-intrinsic-float-log10.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log10.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-log10.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-log10.rs
diff --git a/src/test/codegen/simd-intrinsic-float-log2.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-log2.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-log2.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-log2.rs
diff --git a/src/test/codegen/simd-intrinsic-float-minmax.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-minmax.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-minmax.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-minmax.rs
diff --git a/src/test/codegen/simd-intrinsic-float-pow.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-pow.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-pow.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-pow.rs
diff --git a/src/test/codegen/simd-intrinsic-float-powi.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-powi.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-powi.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-powi.rs
diff --git a/src/test/codegen/simd-intrinsic-float-sin.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-float-sin.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-float-sin.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-float-sin.rs
diff --git a/src/test/codegen/simd-intrinsic-generic-bitmask.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-bitmask.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-generic-bitmask.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-generic-bitmask.rs
diff --git a/src/test/codegen/simd-intrinsic-generic-gather.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-gather.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-generic-gather.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-generic-gather.rs
diff --git a/src/test/codegen/simd-intrinsic-generic-scatter.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-scatter.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-generic-scatter.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-generic-scatter.rs
diff --git a/src/test/codegen/simd-intrinsic-generic-select.rs b/src/test/codegen/simd-intrinsic/simd-intrinsic-generic-select.rs
similarity index 100%
rename from src/test/codegen/simd-intrinsic-generic-select.rs
rename to src/test/codegen/simd-intrinsic/simd-intrinsic-generic-select.rs