diff --git a/rust-version b/rust-version
index 74b2e148f8..e679a6c322 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-1773f14a24c49356b384e45ebb45643bc9bef2c4
+e002ac7e8a1eb04961a722c44b3ffbad575a6caa
diff --git a/tests/compile-fail/backtrace/bad-backtrace-ptr.rs b/tests/compile-fail/backtrace/bad-backtrace-ptr.rs
index 0c49a527bc..c83bf1eb38 100644
--- a/tests/compile-fail/backtrace/bad-backtrace-ptr.rs
+++ b/tests/compile-fail/backtrace/bad-backtrace-ptr.rs
@@ -4,6 +4,6 @@ extern "Rust" {
 
 fn main() {
     unsafe {
-        miri_resolve_frame(0 as *mut _, 0); //~ ERROR 0x0 is not a valid pointer
+        miri_resolve_frame(0 as *mut _, 0); //~ ERROR null pointer is not a valid pointer for this operation
     }
 }
diff --git a/tests/compile-fail/dangling_pointers/deref-invalid-ptr.rs b/tests/compile-fail/dangling_pointers/deref-invalid-ptr.rs
index 6aa93e7147..87071d8b45 100644
--- a/tests/compile-fail/dangling_pointers/deref-invalid-ptr.rs
+++ b/tests/compile-fail/dangling_pointers/deref-invalid-ptr.rs
@@ -3,5 +3,5 @@
 
 fn main() {
     let x = 16usize as *const u32;
-    let _y = unsafe { &*x as *const u32 }; //~ ERROR inbounds test failed: 0x10 is not a valid pointer
+    let _y = unsafe { &*x as *const u32 }; //~ ERROR 0x10 is not a valid pointer
 }
diff --git a/tests/compile-fail/dangling_pointers/wild_pointer_deref.rs b/tests/compile-fail/dangling_pointers/wild_pointer_deref.rs
index 371e72d282..2749ccfc0a 100644
--- a/tests/compile-fail/dangling_pointers/wild_pointer_deref.rs
+++ b/tests/compile-fail/dangling_pointers/wild_pointer_deref.rs
@@ -1,5 +1,5 @@
 fn main() {
     let p = 44 as *const i32;
-    let x = unsafe { *p }; //~ ERROR inbounds test failed: 0x2c is not a valid pointer
+    let x = unsafe { *p }; //~ ERROR 0x2c is not a valid pointer
     panic!("this should never print: {}", x);
 }
diff --git a/tests/compile-fail/function_pointers/cast_int_to_fn_ptr.rs b/tests/compile-fail/function_pointers/cast_int_to_fn_ptr.rs
index 94ff332712..299fd5ae49 100644
--- a/tests/compile-fail/function_pointers/cast_int_to_fn_ptr.rs
+++ b/tests/compile-fail/function_pointers/cast_int_to_fn_ptr.rs
@@ -6,5 +6,5 @@ fn main() {
         std::mem::transmute::<usize, fn(i32)>(42)
     };
 
-    g(42) //~ ERROR inbounds test failed: 0x2a is not a valid pointer
+    g(42) //~ ERROR 0x2a is not a valid pointer
 }
diff --git a/tests/compile-fail/intrinsics/ptr_offset_0_plus_0.rs b/tests/compile-fail/intrinsics/ptr_offset_0_plus_0.rs
index d6cf3d65f2..d8a8f66e7a 100644
--- a/tests/compile-fail/intrinsics/ptr_offset_0_plus_0.rs
+++ b/tests/compile-fail/intrinsics/ptr_offset_0_plus_0.rs
@@ -1,4 +1,4 @@
-// error-pattern: inbounds test failed: 0x0 is not a valid pointer
+// error-pattern: pointer arithmetic failed: 0x0 is not a valid pointer
 
 fn main() {
     let x = 0 as *mut i32;
diff --git a/tests/compile-fail/intrinsics/ptr_offset_int_plus_int.rs b/tests/compile-fail/intrinsics/ptr_offset_int_plus_int.rs
index 4bee2fec6b..ea6bef151e 100644
--- a/tests/compile-fail/intrinsics/ptr_offset_int_plus_int.rs
+++ b/tests/compile-fail/intrinsics/ptr_offset_int_plus_int.rs
@@ -1,4 +1,4 @@
-// error-pattern: inbounds test failed: 0x1 is not a valid pointer
+// error-pattern: 0x1 is not a valid pointer
 
 fn main() {
     // Can't offset an integer pointer by non-zero offset.
diff --git a/tests/compile-fail/intrinsics/ptr_offset_int_plus_ptr.rs b/tests/compile-fail/intrinsics/ptr_offset_int_plus_ptr.rs
index 892dbca112..8ff5c3596e 100644
--- a/tests/compile-fail/intrinsics/ptr_offset_int_plus_ptr.rs
+++ b/tests/compile-fail/intrinsics/ptr_offset_int_plus_ptr.rs
@@ -1,4 +1,4 @@
-// error-pattern: inbounds test failed: 0x1 is not a valid pointer
+// error-pattern: 0x1 is not a valid pointer
 
 fn main() {
     let ptr = Box::into_raw(Box::new(0u32));
diff --git a/tests/compile-fail/null_pointer_deref.rs b/tests/compile-fail/null_pointer_deref.rs
index ab415d8746..076b2df609 100644
--- a/tests/compile-fail/null_pointer_deref.rs
+++ b/tests/compile-fail/null_pointer_deref.rs
@@ -1,5 +1,5 @@
 #[allow(deref_nullptr)]
 fn main() {
-    let x: i32 = unsafe { *std::ptr::null() }; //~ ERROR inbounds test failed: 0x0 is not a valid pointer
+    let x: i32 = unsafe { *std::ptr::null() }; //~ ERROR null pointer is not a valid pointer for this operation
     panic!("this should never print: {}", x);
 }
diff --git a/tests/compile-fail/null_pointer_write.rs b/tests/compile-fail/null_pointer_write.rs
index 599d2ff7fd..5294e60c02 100644
--- a/tests/compile-fail/null_pointer_write.rs
+++ b/tests/compile-fail/null_pointer_write.rs
@@ -1,4 +1,4 @@
 #[allow(deref_nullptr)]
 fn main() {
-    unsafe { *std::ptr::null_mut() = 0i32 }; //~ ERROR inbounds test failed: 0x0 is not a valid pointer
+    unsafe { *std::ptr::null_mut() = 0i32 }; //~ ERROR null pointer is not a valid pointer for this operation
 }
diff --git a/tests/compile-fail/stacked_borrows/issue-miri-1050-2.rs b/tests/compile-fail/stacked_borrows/issue-miri-1050-2.rs
index c40d8de21d..30cbf0b339 100644
--- a/tests/compile-fail/stacked_borrows/issue-miri-1050-2.rs
+++ b/tests/compile-fail/stacked_borrows/issue-miri-1050-2.rs
@@ -1,4 +1,4 @@
-// error-pattern: inbounds test failed: 0x4 is not a valid pointer
+// error-pattern: 0x4 is not a valid pointer
 use std::ptr::NonNull;
 
 fn main() { unsafe {