diff --git a/cuda_core/tests/test_device.py b/cuda_core/tests/test_device.py
index 852ccc6d9..3fed6c32a 100644
--- a/cuda_core/tests/test_device.py
+++ b/cuda_core/tests/test_device.py
@@ -37,18 +37,26 @@ def test_device_set_current(deinit_cuda):
     assert handle_return(driver.cuCtxGetCurrent()) is not None
 
 
-def test_device_repr():
+def test_device_repr(deinit_cuda):
     device = Device(0)
+    device.set_current()
     assert str(device).startswith("<Device 0")
 
 
-def test_device_alloc(init_cuda):
+def test_device_alloc(deinit_cuda):
     device = Device()
+    device.set_current()
     buffer = device.allocate(1024)
     device.sync()
     assert buffer.handle != 0
     assert buffer.size == 1024
-    assert buffer.device_id == 0
+    assert buffer.device_id == int(device)
+
+
+def test_device_id(deinit_cuda):
+    for device in cuda.core.experimental.system.devices:
+        device.set_current()
+        assert device.device_id == handle_return(runtime.cudaGetDevice())
 
 
 def test_device_create_stream(init_cuda):