diff --git a/rust-version b/rust-version
index 5526a13d5f..b3496efafd 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-22ee39504a702f75485582d02060495a01254de1
+9e2f65586366b731f13a10021c5191a664f4adc2
diff --git a/tests/compile-fail/null_pointer_deref.rs b/tests/compile-fail/dangling_pointers/null_pointer_deref.rs
similarity index 100%
rename from tests/compile-fail/null_pointer_deref.rs
rename to tests/compile-fail/dangling_pointers/null_pointer_deref.rs
diff --git a/tests/compile-fail/null_pointer_deref_zst.rs b/tests/compile-fail/dangling_pointers/null_pointer_deref_zst.rs
similarity index 100%
rename from tests/compile-fail/null_pointer_deref_zst.rs
rename to tests/compile-fail/dangling_pointers/null_pointer_deref_zst.rs
diff --git a/tests/compile-fail/null_pointer_write.rs b/tests/compile-fail/dangling_pointers/null_pointer_write.rs
similarity index 100%
rename from tests/compile-fail/null_pointer_write.rs
rename to tests/compile-fail/dangling_pointers/null_pointer_write.rs
diff --git a/tests/compile-fail/null_pointer_write_zst.rs b/tests/compile-fail/dangling_pointers/null_pointer_write_zst.rs
similarity index 100%
rename from tests/compile-fail/null_pointer_write_zst.rs
rename to tests/compile-fail/dangling_pointers/null_pointer_write_zst.rs
diff --git a/tests/compile-fail/ptr_int_unexposed.rs b/tests/compile-fail/provenance/ptr_int_unexposed.rs
similarity index 100%
rename from tests/compile-fail/ptr_int_unexposed.rs
rename to tests/compile-fail/provenance/ptr_int_unexposed.rs
diff --git a/tests/compile-fail/ptr_legacy_provenance.rs b/tests/compile-fail/provenance/ptr_legacy_provenance.rs
similarity index 100%
rename from tests/compile-fail/ptr_legacy_provenance.rs
rename to tests/compile-fail/provenance/ptr_legacy_provenance.rs
diff --git a/tests/compile-fail/strict-provenance-offset.rs b/tests/compile-fail/provenance/strict-provenance-offset.rs
similarity index 100%
rename from tests/compile-fail/strict-provenance-offset.rs
rename to tests/compile-fail/provenance/strict-provenance-offset.rs
diff --git a/tests/compile-fail/strict_provenance_transmute.rs b/tests/compile-fail/provenance/strict_provenance_transmute.rs
similarity index 100%
rename from tests/compile-fail/strict_provenance_transmute.rs
rename to tests/compile-fail/provenance/strict_provenance_transmute.rs
diff --git a/tests/compile-fail/ptr_integer_array_transmute.rs b/tests/compile-fail/validity/ptr_integer_array_transmute.rs
similarity index 100%
rename from tests/compile-fail/ptr_integer_array_transmute.rs
rename to tests/compile-fail/validity/ptr_integer_array_transmute.rs
diff --git a/tests/compile-fail/too-big-slice.rs b/tests/compile-fail/validity/too-big-slice.rs
similarity index 100%
rename from tests/compile-fail/too-big-slice.rs
rename to tests/compile-fail/validity/too-big-slice.rs
diff --git a/tests/compile-fail/too-big-unsized.rs b/tests/compile-fail/validity/too-big-unsized.rs
similarity index 100%
rename from tests/compile-fail/too-big-unsized.rs
rename to tests/compile-fail/validity/too-big-unsized.rs