diff --git a/cuda_core/tests/system/test_system_device.py b/cuda_core/tests/system/test_system_device.py
index 3b2131548b9..3de98f76be7 100644
--- a/cuda_core/tests/system/test_system_device.py
+++ b/cuda_core/tests/system/test_system_device.py
@@ -440,6 +440,9 @@ def test_module_id():
 
 
 def test_addressing_mode():
+    if system.get_kernel_mode_driver_version()[0] < 580:
+        pytest.skip("nvmlDeviceGetAddressingMode requires an R580+ kernel-mode driver")
+
     for device in system.Device.get_all_devices():
         # By docs, should be supported on TURING or newer, but experimentally,
         # is also unsupported on other hardware.
@@ -458,6 +461,9 @@ def test_display_mode():
 
 
 def test_repair_status():
+    if system.get_kernel_mode_driver_version()[0] < 580:
+        pytest.skip("nvmlDeviceGetRepairStatus requires an R580+ kernel-mode driver")
+
     for device in system.Device.get_all_devices():
         # By docs, should be supported on AMPERE or newer, but experimentally,
         # this seems to also work on some TURING systems.