diff --git a/src/test/compile-fail/specialization-default-projection.rs b/src/test/compile-fail/specialization/specialization-default-projection.rs
similarity index 100%
rename from src/test/compile-fail/specialization-default-projection.rs
rename to src/test/compile-fail/specialization/specialization-default-projection.rs
diff --git a/src/test/compile-fail/specialization-default-types.rs b/src/test/compile-fail/specialization/specialization-default-types.rs
similarity index 100%
rename from src/test/compile-fail/specialization-default-types.rs
rename to src/test/compile-fail/specialization/specialization-default-types.rs
diff --git a/src/test/compile-fail/specialization-feature-gate-default.rs b/src/test/compile-fail/specialization/specialization-feature-gate-default.rs
similarity index 100%
rename from src/test/compile-fail/specialization-feature-gate-default.rs
rename to src/test/compile-fail/specialization/specialization-feature-gate-default.rs
diff --git a/src/test/compile-fail/specialization-feature-gate-overlap.rs b/src/test/compile-fail/specialization/specialization-feature-gate-overlap.rs
similarity index 100%
rename from src/test/compile-fail/specialization-feature-gate-overlap.rs
rename to src/test/compile-fail/specialization/specialization-feature-gate-overlap.rs
diff --git a/src/test/compile-fail/specialization-no-default.rs b/src/test/compile-fail/specialization/specialization-no-default.rs
similarity index 100%
rename from src/test/compile-fail/specialization-no-default.rs
rename to src/test/compile-fail/specialization/specialization-no-default.rs
diff --git a/src/test/compile-fail/specialization-overlap-negative.rs b/src/test/compile-fail/specialization/specialization-overlap-negative.rs
similarity index 100%
rename from src/test/compile-fail/specialization-overlap-negative.rs
rename to src/test/compile-fail/specialization/specialization-overlap-negative.rs
diff --git a/src/test/compile-fail/specialization-overlap.rs b/src/test/compile-fail/specialization/specialization-overlap.rs
similarity index 100%
rename from src/test/compile-fail/specialization-overlap.rs
rename to src/test/compile-fail/specialization/specialization-overlap.rs
diff --git a/src/test/compile-fail/specialization-polarity.rs b/src/test/compile-fail/specialization/specialization-polarity.rs
similarity index 100%
rename from src/test/compile-fail/specialization-polarity.rs
rename to src/test/compile-fail/specialization/specialization-polarity.rs
diff --git a/src/test/run-pass/specialization-allowed-cross-crate.rs b/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs
similarity index 100%
rename from src/test/run-pass/specialization-allowed-cross-crate.rs
rename to src/test/run-pass/specialization/specialization-allowed-cross-crate.rs
diff --git a/src/test/run-pass/specialization-assoc-fns.rs b/src/test/run-pass/specialization/specialization-assoc-fns.rs
similarity index 100%
rename from src/test/run-pass/specialization-assoc-fns.rs
rename to src/test/run-pass/specialization/specialization-assoc-fns.rs
diff --git a/src/test/run-pass/specialization-basics.rs b/src/test/run-pass/specialization/specialization-basics.rs
similarity index 100%
rename from src/test/run-pass/specialization-basics.rs
rename to src/test/run-pass/specialization/specialization-basics.rs
diff --git a/src/test/run-pass/specialization-cross-crate-defaults.rs b/src/test/run-pass/specialization/specialization-cross-crate-defaults.rs
similarity index 100%
rename from src/test/run-pass/specialization-cross-crate-defaults.rs
rename to src/test/run-pass/specialization/specialization-cross-crate-defaults.rs
diff --git a/src/test/run-pass/specialization-cross-crate.rs b/src/test/run-pass/specialization/specialization-cross-crate.rs
similarity index 100%
rename from src/test/run-pass/specialization-cross-crate.rs
rename to src/test/run-pass/specialization/specialization-cross-crate.rs
diff --git a/src/test/run-pass/specialization-default-methods.rs b/src/test/run-pass/specialization/specialization-default-methods.rs
similarity index 100%
rename from src/test/run-pass/specialization-default-methods.rs
rename to src/test/run-pass/specialization/specialization-default-methods.rs
diff --git a/src/test/run-pass/specialization-on-projection.rs b/src/test/run-pass/specialization/specialization-on-projection.rs
similarity index 100%
rename from src/test/run-pass/specialization-on-projection.rs
rename to src/test/run-pass/specialization/specialization-on-projection.rs
diff --git a/src/test/run-pass/specialization-out-of-order.rs b/src/test/run-pass/specialization/specialization-out-of-order.rs
similarity index 100%
rename from src/test/run-pass/specialization-out-of-order.rs
rename to src/test/run-pass/specialization/specialization-out-of-order.rs
diff --git a/src/test/run-pass/specialization-projection-alias.rs b/src/test/run-pass/specialization/specialization-projection-alias.rs
similarity index 100%
rename from src/test/run-pass/specialization-projection-alias.rs
rename to src/test/run-pass/specialization/specialization-projection-alias.rs
diff --git a/src/test/run-pass/specialization-projection.rs b/src/test/run-pass/specialization/specialization-projection.rs
similarity index 100%
rename from src/test/run-pass/specialization-projection.rs
rename to src/test/run-pass/specialization/specialization-projection.rs
diff --git a/src/test/run-pass/specialization-super-traits.rs b/src/test/run-pass/specialization/specialization-super-traits.rs
similarity index 100%
rename from src/test/run-pass/specialization-super-traits.rs
rename to src/test/run-pass/specialization/specialization-super-traits.rs
diff --git a/src/test/run-pass/specialization-translate-projections-with-params.rs b/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs
similarity index 100%
rename from src/test/run-pass/specialization-translate-projections-with-params.rs
rename to src/test/run-pass/specialization/specialization-translate-projections-with-params.rs
diff --git a/src/test/run-pass/specialization-translate-projections.rs b/src/test/run-pass/specialization/specialization-translate-projections.rs
similarity index 100%
rename from src/test/run-pass/specialization-translate-projections.rs
rename to src/test/run-pass/specialization/specialization-translate-projections.rs