diff --git a/src/test/run-pass/ctfe/assoc-const.rs b/src/test/run-pass/consts/assoc-const.rs
similarity index 100%
rename from src/test/run-pass/ctfe/assoc-const.rs
rename to src/test/run-pass/consts/assoc-const.rs
diff --git a/src/test/run-pass/ctfe/bswap-const.rs b/src/test/run-pass/consts/bswap-const.rs
similarity index 100%
rename from src/test/run-pass/ctfe/bswap-const.rs
rename to src/test/run-pass/consts/bswap-const.rs
diff --git a/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs b/src/test/run-pass/consts/chained-constants-stackoverflow.rs
similarity index 100%
rename from src/test/run-pass/ctfe/chained-constants-stackoverflow.rs
rename to src/test/run-pass/consts/chained-constants-stackoverflow.rs
diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement-3.rs b/src/test/run-pass/consts/const-block-non-item-statement-3.rs
similarity index 100%
rename from src/test/run-pass/ctfe/const-block-non-item-statement-3.rs
rename to src/test/run-pass/consts/const-block-non-item-statement-3.rs
diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement.rs b/src/test/run-pass/consts/const-block-non-item-statement.rs
similarity index 100%
rename from src/test/run-pass/ctfe/const-block-non-item-statement.rs
rename to src/test/run-pass/consts/const-block-non-item-statement.rs
diff --git a/src/test/run-pass/ctfe/const-fn-type-name.rs b/src/test/run-pass/consts/const-fn-type-name.rs
similarity index 100%
rename from src/test/run-pass/ctfe/const-fn-type-name.rs
rename to src/test/run-pass/consts/const-fn-type-name.rs
diff --git a/src/test/run-pass/const-int-conversion.rs b/src/test/run-pass/consts/const-int-conversion.rs
similarity index 100%
rename from src/test/run-pass/const-int-conversion.rs
rename to src/test/run-pass/consts/const-int-conversion.rs
diff --git a/src/test/run-pass/const-int-overflowing.rs b/src/test/run-pass/consts/const-int-overflowing.rs
similarity index 100%
rename from src/test/run-pass/const-int-overflowing.rs
rename to src/test/run-pass/consts/const-int-overflowing.rs
diff --git a/src/test/run-pass/const-int-rotate.rs b/src/test/run-pass/consts/const-int-rotate.rs
similarity index 100%
rename from src/test/run-pass/const-int-rotate.rs
rename to src/test/run-pass/consts/const-int-rotate.rs
diff --git a/src/test/run-pass/const-int-saturating-arith.rs b/src/test/run-pass/consts/const-int-saturating-arith.rs
similarity index 100%
rename from src/test/run-pass/const-int-saturating-arith.rs
rename to src/test/run-pass/consts/const-int-saturating-arith.rs
diff --git a/src/test/run-pass/const-int-sign.rs b/src/test/run-pass/consts/const-int-sign.rs
similarity index 100%
rename from src/test/run-pass/const-int-sign.rs
rename to src/test/run-pass/consts/const-int-sign.rs
diff --git a/src/test/run-pass/const-int-wrapping.rs b/src/test/run-pass/consts/const-int-wrapping.rs
similarity index 100%
rename from src/test/run-pass/const-int-wrapping.rs
rename to src/test/run-pass/consts/const-int-wrapping.rs
diff --git a/src/test/run-pass/const-needs_drop.rs b/src/test/run-pass/consts/const-needs_drop.rs
similarity index 100%
rename from src/test/run-pass/const-needs_drop.rs
rename to src/test/run-pass/consts/const-needs_drop.rs
diff --git a/src/test/run-pass/ctfe/deref_in_pattern.rs b/src/test/run-pass/consts/deref_in_pattern.rs
similarity index 100%
rename from src/test/run-pass/ctfe/deref_in_pattern.rs
rename to src/test/run-pass/consts/deref_in_pattern.rs
diff --git a/src/test/run-pass/ctfe/ice-48279.rs b/src/test/run-pass/consts/ice-48279.rs
similarity index 100%
rename from src/test/run-pass/ctfe/ice-48279.rs
rename to src/test/run-pass/consts/ice-48279.rs
diff --git a/src/test/run-pass/ctfe/issue-37550.rs b/src/test/run-pass/consts/issue-37550.rs
similarity index 100%
rename from src/test/run-pass/ctfe/issue-37550.rs
rename to src/test/run-pass/consts/issue-37550.rs
diff --git a/src/test/run-pass/ctfe/issue-broken-mir.rs b/src/test/run-pass/consts/issue-broken-mir.rs
similarity index 100%
rename from src/test/run-pass/ctfe/issue-broken-mir.rs
rename to src/test/run-pass/consts/issue-broken-mir.rs
diff --git a/src/test/run-pass/ctfe/locals-in-const-fn.rs b/src/test/run-pass/consts/locals-in-const-fn.rs
similarity index 100%
rename from src/test/run-pass/ctfe/locals-in-const-fn.rs
rename to src/test/run-pass/consts/locals-in-const-fn.rs
diff --git a/src/test/run-pass/ctfe/match-const-fn-structs.rs b/src/test/run-pass/consts/match-const-fn-structs.rs
similarity index 100%
rename from src/test/run-pass/ctfe/match-const-fn-structs.rs
rename to src/test/run-pass/consts/match-const-fn-structs.rs
diff --git a/src/test/run-pass/ctfe/mozjs-error.rs b/src/test/run-pass/consts/mozjs-error.rs
similarity index 100%
rename from src/test/run-pass/ctfe/mozjs-error.rs
rename to src/test/run-pass/consts/mozjs-error.rs
diff --git a/src/test/run-pass/ctfe/non-scalar-cast.rs b/src/test/run-pass/consts/non-scalar-cast.rs
similarity index 100%
rename from src/test/run-pass/ctfe/non-scalar-cast.rs
rename to src/test/run-pass/consts/non-scalar-cast.rs
diff --git a/src/test/run-pass/ctfe/promotion.rs b/src/test/run-pass/consts/promotion.rs
similarity index 100%
rename from src/test/run-pass/ctfe/promotion.rs
rename to src/test/run-pass/consts/promotion.rs
diff --git a/src/test/run-pass/ctfe/references.rs b/src/test/run-pass/consts/references.rs
similarity index 100%
rename from src/test/run-pass/ctfe/references.rs
rename to src/test/run-pass/consts/references.rs
diff --git a/src/test/run-pass/ctfe/repeat_match.rs b/src/test/run-pass/consts/repeat_match.rs
similarity index 100%
rename from src/test/run-pass/ctfe/repeat_match.rs
rename to src/test/run-pass/consts/repeat_match.rs
diff --git a/src/test/run-pass/ctfe/return-in-const-fn.rs b/src/test/run-pass/consts/return-in-const-fn.rs
similarity index 100%
rename from src/test/run-pass/ctfe/return-in-const-fn.rs
rename to src/test/run-pass/consts/return-in-const-fn.rs
diff --git a/src/test/run-pass/ctfe/signed_enum_discr.rs b/src/test/run-pass/consts/signed_enum_discr.rs
similarity index 100%
rename from src/test/run-pass/ctfe/signed_enum_discr.rs
rename to src/test/run-pass/consts/signed_enum_discr.rs
diff --git a/src/test/run-pass/ctfe/transmute-const.rs b/src/test/run-pass/consts/transmute-const.rs
similarity index 100%
rename from src/test/run-pass/ctfe/transmute-const.rs
rename to src/test/run-pass/consts/transmute-const.rs
diff --git a/src/test/run-pass/ctfe/tuple-struct-constructors.rs b/src/test/run-pass/consts/tuple-struct-constructors.rs
similarity index 100%
rename from src/test/run-pass/ctfe/tuple-struct-constructors.rs
rename to src/test/run-pass/consts/tuple-struct-constructors.rs