diff --git a/test/mifare_classic_fixture.c b/test/mifare_classic_fixture.c
index fa34d5f..b6709f3 100644
--- a/test/mifare_classic_fixture.c
+++ b/test/mifare_classic_fixture.c
@@ -30,7 +30,8 @@ setup ()
     int res;
 
     device = nfc_connect (NULL);
-    cut_assert_not_null (device, cut_message ("No device found"));
+    if (!device)
+	cut_omit ("No device found");
 
     tags = freefare_get_tags (device);
     cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed"));
@@ -44,7 +45,8 @@ setup ()
 	}
     }
 
-    cut_assert_not_null (tag, cut_message ("No MIFARE Classic tag on NFC device"));
+    if (!tag)
+	cut_omit ("No MIFARE Classic tag on NFC device");
 
     res = mifare_classic_connect (tag);
     cut_assert_equal_int (0, res, cut_message ("mifare_classic_connect() failed"));
diff --git a/test/mifare_ultralight_fixture.c b/test/mifare_ultralight_fixture.c
index aa0b57e..feae515 100644
--- a/test/mifare_ultralight_fixture.c
+++ b/test/mifare_ultralight_fixture.c
@@ -30,7 +30,8 @@ setup ()
     int res;
 
     device = nfc_connect (NULL);
-    cut_assert_not_null (device, cut_message ("No device found"));
+    if (!device)
+	cut_omit ("No device found");
 
     tags = freefare_get_tags (device);
     cut_assert_not_null (tags, cut_message ("freefare_get_tags() failed"));
@@ -43,7 +44,8 @@ setup ()
 	}
     }
 
-    cut_assert_not_null (tag, cut_message ("No MIFARE UltraLight tag on NFC device"));
+    if (!tag)
+	cut_omit ("No MIFARE UltraLight tag on NFC device");
 
     res = mifare_ultralight_connect (tag);
     cut_assert_equal_int (0, res, cut_message ("mifare_ultralight_connect() failed"));