diff --git a/src/test_class.rs b/src/test_class.rs
index 3f2d077..4efb37d 100644
--- a/src/test_class.rs
+++ b/src/test_class.rs
@@ -22,7 +22,11 @@ mod sizes {
     pub const INTERRUPT_ENDPOINT: u16 = 31;
 }
 
-static mut CONTROL_BUFFER: UnsafeCell<[u8; 256]> = UnsafeCell::new([0; 256]);
+pub struct ControlBuffer(UnsafeCell<[u8; 256]>);
+
+unsafe impl Sync for ControlBuffer {}
+
+static CONTROL_BUFFER: ControlBuffer = ControlBuffer(UnsafeCell::new([0; 256]));
 
 /// Test USB class for testing USB driver implementations. Supports various endpoint types and
 /// requests for testing USB peripheral drivers on actual hardware.
@@ -115,7 +119,7 @@ impl<B: UsbBus> TestClass<'_, B> {
         usb_bus: &'a UsbBusAllocator<B>,
     ) -> UsbDeviceBuilder<'a, B> {
         UsbDeviceBuilder::new(usb_bus, UsbVidPid(VID, PID), unsafe {
-            CONTROL_BUFFER.get_mut()
+            &mut *(CONTROL_BUFFER.0.get())
         })
         .strings(&[StringDescriptors::default()
             .manufacturer(MANUFACTURER)
diff --git a/tests/test_class_host/device.rs b/tests/test_class_host/device.rs
index d204985..80282a7 100644
--- a/tests/test_class_host/device.rs
+++ b/tests/test_class_host/device.rs
@@ -60,7 +60,7 @@ pub fn open_device(ctx: &Context) -> rusb::Result<DeviceHandles> {
             continue;
         }
 
-        let mut handle = device.open()?;
+        let handle = device.open()?;
 
         let langs = handle.read_languages(TIMEOUT)?;
         if langs.is_empty() || langs[0].lang_id() != EN_US {