diff --git a/tests/ui/arch/debug_printf_type_checking.stderr b/tests/ui/arch/debug_printf_type_checking.stderr
index b027cc7b34..dae06105ea 100644
--- a/tests/ui/arch/debug_printf_type_checking.stderr
+++ b/tests/ui/arch/debug_printf_type_checking.stderr
@@ -75,9 +75,9 @@ help: the return type of this call is `u32` due to the type of the argument pass
     |                             |
     |                             this argument influences the return type of `spirv_std`
 note: function defined here
-   --> $SPIRV_STD_SRC/lib.rs:138:8
+   --> $SPIRV_STD_SRC/lib.rs:141:8
     |
-138 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
+141 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `u32` to `f32`
@@ -102,9 +102,9 @@ help: the return type of this call is `f32` due to the type of the argument pass
     |                             |
     |                             this argument influences the return type of `spirv_std`
 note: function defined here
-   --> $SPIRV_STD_SRC/lib.rs:138:8
+   --> $SPIRV_STD_SRC/lib.rs:141:8
     |
-138 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
+141 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `f32` to `u32`
@@ -129,12 +129,12 @@ error[E0277]: the trait bound `{float}: Vector<f32, 2>` is not satisfied
               <UVec3 as Vector<u32, 3>>
             and 5 others
 note: required by a bound in `debug_printf_assert_is_vector`
-   --> $SPIRV_STD_SRC/lib.rs:145:8
+   --> $SPIRV_STD_SRC/lib.rs:148:8
     |
-143 | pub fn debug_printf_assert_is_vector<
+146 | pub fn debug_printf_assert_is_vector<
     |        ----------------------------- required by a bound in this function
-144 |     TY: crate::scalar::Scalar,
-145 |     V: crate::vector::Vector<TY, SIZE>,
+147 |     TY: crate::scalar::Scalar,
+148 |     V: crate::vector::Vector<TY, SIZE>,
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `debug_printf_assert_is_vector`
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -155,9 +155,9 @@ help: the return type of this call is `Vec2` due to the type of the argument pas
     |                             |
     |                             this argument influences the return type of `spirv_std`
 note: function defined here
-   --> $SPIRV_STD_SRC/lib.rs:138:8
+   --> $SPIRV_STD_SRC/lib.rs:141:8
     |
-138 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
+141 | pub fn debug_printf_assert_is_type<T>(ty: T) -> T {
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/byte_addressable_buffer/arr.rs b/tests/ui/byte_addressable_buffer/arr.rs
index 4cacbcf906..c90f058c14 100644
--- a/tests/ui/byte_addressable_buffer/arr.rs
+++ b/tests/ui/byte_addressable_buffer/arr.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::{glam::Vec4, ByteAddressableBuffer};
+use spirv_std::{glam::Vec4, ByteAddressableBuffer, MutByteAddressableBuffer};
 
 #[spirv(fragment)]
 pub fn load(
@@ -20,7 +20,7 @@ pub fn store(
     #[spirv(flat)] val: [i32; 4],
 ) {
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
     }
 }
diff --git a/tests/ui/byte_addressable_buffer/big_struct.rs b/tests/ui/byte_addressable_buffer/big_struct.rs
index 27907afe3c..c2988c911d 100644
--- a/tests/ui/byte_addressable_buffer/big_struct.rs
+++ b/tests/ui/byte_addressable_buffer/big_struct.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::ByteAddressableBuffer;
+use spirv_std::{ByteAddressableBuffer, MutByteAddressableBuffer};
 
 pub struct BigStruct {
     a: u32,
@@ -29,7 +29,7 @@ pub fn store(
     #[spirv(flat)] val: BigStruct,
 ) {
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
     }
 }
diff --git a/tests/ui/byte_addressable_buffer/complex.rs b/tests/ui/byte_addressable_buffer/complex.rs
index 1ec3267a2e..dd6e16331f 100644
--- a/tests/ui/byte_addressable_buffer/complex.rs
+++ b/tests/ui/byte_addressable_buffer/complex.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::{glam::Vec2, ByteAddressableBuffer};
+use spirv_std::{glam::Vec2, ByteAddressableBuffer, MutByteAddressableBuffer};
 
 pub struct Complex {
     x: u32,
@@ -35,7 +35,7 @@ pub fn store(
     val: Nesty,
 ) {
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
     }
 }
diff --git a/tests/ui/byte_addressable_buffer/empty_struct.rs b/tests/ui/byte_addressable_buffer/empty_struct.rs
index b586139d3a..d6d13e5300 100644
--- a/tests/ui/byte_addressable_buffer/empty_struct.rs
+++ b/tests/ui/byte_addressable_buffer/empty_struct.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::ByteAddressableBuffer;
+use spirv_std::{ByteAddressableBuffer, MutByteAddressableBuffer};
 
 pub struct EmptyStruct {}
 
@@ -20,7 +20,7 @@ pub fn load(
 pub fn store(#[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32]) {
     let val = EmptyStruct {};
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
     }
 }
diff --git a/tests/ui/byte_addressable_buffer/f32.rs b/tests/ui/byte_addressable_buffer/f32.rs
index 3dc5d3ffe3..a6cd7fe2e5 100644
--- a/tests/ui/byte_addressable_buffer/f32.rs
+++ b/tests/ui/byte_addressable_buffer/f32.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::ByteAddressableBuffer;
+use spirv_std::{ByteAddressableBuffer, MutByteAddressableBuffer};
 
 #[spirv(fragment)]
 pub fn load(
@@ -17,7 +17,7 @@ pub fn load(
 #[spirv(fragment)]
 pub fn store(#[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32], val: f32) {
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
     }
 }
diff --git a/tests/ui/byte_addressable_buffer/small_struct.rs b/tests/ui/byte_addressable_buffer/small_struct.rs
index d6959db768..96a43a80f4 100644
--- a/tests/ui/byte_addressable_buffer/small_struct.rs
+++ b/tests/ui/byte_addressable_buffer/small_struct.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::ByteAddressableBuffer;
+use spirv_std::{ByteAddressableBuffer, MutByteAddressableBuffer};
 
 pub struct SmallStruct {
     a: u32,
@@ -27,7 +27,7 @@ pub fn store(
 ) {
     let val = SmallStruct { a, b };
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
     }
 }
diff --git a/tests/ui/byte_addressable_buffer/u32.rs b/tests/ui/byte_addressable_buffer/u32.rs
index 8d5d03ad65..7bbd48d4ba 100644
--- a/tests/ui/byte_addressable_buffer/u32.rs
+++ b/tests/ui/byte_addressable_buffer/u32.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::ByteAddressableBuffer;
+use spirv_std::{ByteAddressableBuffer, MutByteAddressableBuffer};
 
 #[spirv(fragment)]
 pub fn load(
@@ -20,7 +20,7 @@ pub fn store(
     #[spirv(flat)] val: u32,
 ) {
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
     }
 }
diff --git a/tests/ui/byte_addressable_buffer/vec.rs b/tests/ui/byte_addressable_buffer/vec.rs
index 49ecbc15c2..060c3aad63 100644
--- a/tests/ui/byte_addressable_buffer/vec.rs
+++ b/tests/ui/byte_addressable_buffer/vec.rs
@@ -1,7 +1,7 @@
 // build-pass
 
 use spirv_std::spirv;
-use spirv_std::{glam::Vec4, ByteAddressableBuffer};
+use spirv_std::{glam::Vec4, ByteAddressableBuffer, MutByteAddressableBuffer};
 
 #[spirv(matrix)]
 pub struct Mat4 {
@@ -31,7 +31,7 @@ pub fn store(
     valmat: Mat4,
 ) {
     unsafe {
-        let mut buf = ByteAddressableBuffer::new(buf);
+        let mut buf = MutByteAddressableBuffer::new(buf);
         buf.store(5, val);
         buf.store(5, valmat);
     }