diff --git a/tests/rocm_smi_test/functional/fan_read.cc b/tests/rocm_smi_test/functional/fan_read.cc
index 1597e13b8e..ad1356f69b 100755
--- a/tests/rocm_smi_test/functional/fan_read.cc
+++ b/tests/rocm_smi_test/functional/fan_read.cc
@@ -102,7 +102,16 @@ void TestFanRead::Run(void) {
         std::cout << "\t**Current Fan Speed: ";
       }
       err = rsmi_dev_fan_speed_get(i, 0, &val_i64);
-      CHK_ERR_ASRT(err)
+      if (err == RSMI_STATUS_NOT_SUPPORTED) {
+          IF_VERB(STANDARD) {
+            std::cout << "\t**" <<  ": " <<
+                               "Not supported on this machine" << std::endl;
+          }
+          return;
+      } else {
+        CHK_ERR_ASRT(err)
+      }
+
 
       // Verify api support checking functionality is working
       err = rsmi_dev_fan_speed_get(i, 0, nullptr);
diff --git a/tests/rocm_smi_test/functional/fan_read_write.cc b/tests/rocm_smi_test/functional/fan_read_write.cc
index 4342c7a15a..c8129a2f2e 100755
--- a/tests/rocm_smi_test/functional/fan_read_write.cc
+++ b/tests/rocm_smi_test/functional/fan_read_write.cc
@@ -101,7 +101,15 @@ void TestFanReadWrite::Run(void) {
     PrintDeviceHeader(dv_ind);
 
     ret = rsmi_dev_fan_speed_get(dv_ind, 0, &orig_speed);
-    CHK_ERR_ASRT(ret)
+    if (ret == RSMI_STATUS_NOT_SUPPORTED) {
+       IF_VERB(STANDARD) {
+          std::cout << "\t**" <<  ": " <<
+                             "Not supported on this machine" << std::endl;
+        }
+        return;
+    } else {
+        CHK_ERR_ASRT(ret)
+    }
     IF_VERB(STANDARD) {
       std::cout << "Original fan speed: " << orig_speed << std::endl;
     }