diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index bbadfa01221b..adbe2f9d4393 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -441,10 +441,10 @@ declare_features! (
 
     // Allows macro invocations on modules expressions and statements and
     // procedural macros to expand to non-items.
-    (active, proc_macro_mod, "1.27.0", Some(38356), None),
-    (active, proc_macro_expr, "1.27.0", Some(38356), None),
-    (active, proc_macro_non_items, "1.27.0", Some(38356), None),
-    (active, proc_macro_gen, "1.27.0", Some(38356), None),
+    (active, proc_macro_mod, "1.27.0", Some(54727), None),
+    (active, proc_macro_expr, "1.27.0", Some(54727), None),
+    (active, proc_macro_non_items, "1.27.0", Some(54727), None),
+    (active, proc_macro_gen, "1.27.0", Some(54727), None),
 
     // #[doc(alias = "...")]
     (active, doc_alias, "1.27.0", Some(50146), None),
@@ -502,7 +502,7 @@ declare_features! (
     (active, custom_test_frameworks, "1.30.0", Some(50297), None),
 
     // Non-builtin attributes in inner attribute position
-    (active, custom_inner_attributes, "1.30.0", Some(38356), None),
+    (active, custom_inner_attributes, "1.30.0", Some(54726), None),
 
     // Self struct constructor  (RFC 2302)
     (active, self_struct_ctor, "1.30.0", Some(51994), None),
diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/multispan.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/multispan.rs
index cecd9ef4d994..383016f990eb 100644
--- a/src/test/ui-fulldeps/proc-macro/auxiliary/multispan.rs
+++ b/src/test/ui-fulldeps/proc-macro/auxiliary/multispan.rs
@@ -11,7 +11,7 @@
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
-#![feature(proc_macro_diagnostic, proc_macro_span)]
+#![feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)]
 
 extern crate proc_macro;
 
diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs
index 70151278947d..569a458f55a4 100644
--- a/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs
+++ b/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs
@@ -11,7 +11,7 @@
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
-#![feature(proc_macro_diagnostic, proc_macro_span)]
+#![feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)]
 
 extern crate proc_macro;
 
diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr
index 78d81ad04930..98361c879ff6 100644
--- a/src/test/ui/span/issue-36530.stderr
+++ b/src/test/ui/span/issue-36530.stderr
@@ -6,7 +6,7 @@ LL | #[foo] //~ ERROR is currently unknown to the compiler
    |
    = help: add #![feature(custom_attribute)] to the crate attributes to enable
 
-error[E0658]: non-builtin inner attributes are unstable (see issue #38356)
+error[E0658]: non-builtin inner attributes are unstable (see issue #54726)
   --> $DIR/issue-36530.rs:15:5
    |
 LL |     #![foo] //~ ERROR is currently unknown to the compiler