diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h
index 2b20a1f..7aa9e45 100644
--- a/test-tool/iscsi-support.h
+++ b/test-tool/iscsi-support.h
@@ -186,6 +186,16 @@ do {                                                                        \
         }                                                                \
 } while (0);
 
+#define CHECK_FOR_ISCSI(_sd)                                            \
+do {                                                                    \
+        if (_sd->iscsi_ctx == NULL) {                                   \
+                logging(LOG_NORMAL, "[SKIPPED] Not an iSCSI device."    \
+                        " Skipping test");                              \
+                CU_PASS("[SKIPPED] Not an iSCSI device. Skipping test"); \
+                return;                                                 \
+        }                                                               \
+} while (0);
+
 #define CHECK_SIZE(_min_blocks, _c)                                     \
         do {                                                            \
                 if (num_blocks < _min_blocks) {                         \