diff --git a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-disabled.rs b/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-disabled.rs
deleted file mode 100644
index abd11d8b0e9..00000000000
--- a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-disabled.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// aux-build: cross-crate.rs
-extern crate cross_crate;
-
-use cross_crate::*;
-
-fn non_const_context() {
-    NonConst.func();
-    Const.func();
-}
-
-const fn const_context() {
-    NonConst.func();
-    //~^ ERROR: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-    Const.func();
-    //~^ ERROR: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-}
-
-fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-enabled.stderr b/src/test/ui/rfc-2632-const-trait-impl/cross-crate.gated.stderr
similarity index 85%
rename from src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-enabled.stderr
rename to src/test/ui/rfc-2632-const-trait-impl/cross-crate.gated.stderr
index a544c0dd285..30baa385475 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-enabled.stderr
+++ b/src/test/ui/rfc-2632-const-trait-impl/cross-crate.gated.stderr
@@ -1,5 +1,5 @@
 error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-  --> $DIR/cross-crate-feature-enabled.rs:15:5
+  --> $DIR/cross-crate.rs:16:5
    |
 LL |     NonConst.func();
    |     ^^^^^^^^^^^^^^^
diff --git a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-enabled.rs b/src/test/ui/rfc-2632-const-trait-impl/cross-crate.rs
similarity index 65%
rename from src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-enabled.rs
rename to src/test/ui/rfc-2632-const-trait-impl/cross-crate.rs
index b79ccc7712f..c28ff638958 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-enabled.rs
+++ b/src/test/ui/rfc-2632-const-trait-impl/cross-crate.rs
@@ -1,4 +1,5 @@
-#![feature(const_trait_impl)]
+// revisions: stock gated
+#![cfg_attr(gated, feature(const_trait_impl))]
 #![allow(incomplete_features)]
 
 // aux-build: cross-crate.rs
@@ -15,6 +16,7 @@ const fn const_context() {
     NonConst.func();
     //~^ ERROR: calls in constant functions are limited to constant functions, tuple structs and tuple variants
     Const.func();
+    //[stock]~^ ERROR: calls in constant functions are limited to constant functions, tuple structs and tuple variants
 }
 
 fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-disabled.stderr b/src/test/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr
similarity index 82%
rename from src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-disabled.stderr
rename to src/test/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr
index b86583b9e07..e6a86f251ca 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/cross-crate-feature-disabled.stderr
+++ b/src/test/ui/rfc-2632-const-trait-impl/cross-crate.stock.stderr
@@ -1,11 +1,11 @@
 error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-  --> $DIR/cross-crate-feature-disabled.rs:12:5
+  --> $DIR/cross-crate.rs:16:5
    |
 LL |     NonConst.func();
    |     ^^^^^^^^^^^^^^^
 
 error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-  --> $DIR/cross-crate-feature-disabled.rs:14:5
+  --> $DIR/cross-crate.rs:18:5
    |
 LL |     Const.func();
    |     ^^^^^^^^^^^^