diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 4a819814d815c..6c33c4c245b9d 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -225,7 +225,7 @@ declare_features! (
     (active, const_compare_raw_pointers, "1.27.0", Some(53020), None),
 
     // Allows panicking during const eval (produces compile-time errors)
-    (active, const_panic, "1.29.0", Some(51999), None),
+    (active, const_panic, "1.30.0", Some(51999), None),
 
     // Allows using #[prelude_import] on glob `use` items.
     //
diff --git a/src/test/ui/const-eval/const_panic.rs b/src/test/ui/consts/const-eval/const_panic.rs
similarity index 100%
rename from src/test/ui/const-eval/const_panic.rs
rename to src/test/ui/consts/const-eval/const_panic.rs
diff --git a/src/test/ui/const-eval/const_panic.stderr b/src/test/ui/consts/const-eval/const_panic.stderr
similarity index 100%
rename from src/test/ui/const-eval/const_panic.stderr
rename to src/test/ui/consts/const-eval/const_panic.stderr
diff --git a/src/test/ui/const-eval/const_panic_libcore.rs b/src/test/ui/consts/const-eval/const_panic_libcore.rs
similarity index 100%
rename from src/test/ui/const-eval/const_panic_libcore.rs
rename to src/test/ui/consts/const-eval/const_panic_libcore.rs
diff --git a/src/test/ui/const-eval/const_panic_libcore.stderr b/src/test/ui/consts/const-eval/const_panic_libcore.stderr
similarity index 100%
rename from src/test/ui/const-eval/const_panic_libcore.stderr
rename to src/test/ui/consts/const-eval/const_panic_libcore.stderr
diff --git a/src/test/ui/const-eval/const_panic_libcore_main.rs b/src/test/ui/consts/const-eval/const_panic_libcore_main.rs
similarity index 94%
rename from src/test/ui/const-eval/const_panic_libcore_main.rs
rename to src/test/ui/consts/const-eval/const_panic_libcore_main.rs
index bbbe827a8ef2c..c66e1fe4bf5a9 100644
--- a/src/test/ui/const-eval/const_panic_libcore_main.rs
+++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.rs
@@ -28,6 +28,8 @@ const X: () = unimplemented!();
 
 #[lang = "eh_personality"]
 fn eh() {}
+#[lang = "eh_unwind_resume"]
+fn eh_unwind_resume() {}
 
 #[panic_implementation]
 fn panic(_info: &PanicInfo) -> ! {
diff --git a/src/test/ui/const-eval/const_panic_libcore_main.stderr b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
similarity index 100%
rename from src/test/ui/const-eval/const_panic_libcore_main.stderr
rename to src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
diff --git a/src/test/ui/const-eval/feature-gate-const_panic.rs b/src/test/ui/consts/const-eval/feature-gate-const_panic.rs
similarity index 100%
rename from src/test/ui/const-eval/feature-gate-const_panic.rs
rename to src/test/ui/consts/const-eval/feature-gate-const_panic.rs
diff --git a/src/test/ui/const-eval/feature-gate-const_panic.stderr b/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr
similarity index 100%
rename from src/test/ui/const-eval/feature-gate-const_panic.stderr
rename to src/test/ui/consts/const-eval/feature-gate-const_panic.stderr