diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
index 778f6a4446..1274957b2c 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc
@@ -176,6 +176,12 @@ void TestFrequenciesReadWrite::Run(void) {
           std::cout << "Resetting mask to all frequencies." << std::endl;
         }
         ret =  amdsmi_set_clk_freq(processor_handles_[dv_ind], amdsmi_clk, 0xFFFFFFFF);
+        if (ret == AMDSMI_STATUS_NOT_SUPPORTED) {
+          std::cout << "\t**Set all frequencies: Not supported on this machine. Skipping..."
+                    << std::endl;
+          ret = AMDSMI_STATUS_SUCCESS;
+          return;
+        }
         if (ret != AMDSMI_STATUS_SUCCESS) {
           return;
         }
diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
index 9796115dd7..0595702ecf 100755
--- a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
+++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc
@@ -158,15 +158,18 @@ void TestVoltCurvRead::Run(void) {
     PrintDeviceHeader(processor_handles_[i]);
 
     err =  amdsmi_get_gpu_od_volt_info(processor_handles_[i], &odv);
-    if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
+    if (err == AMDSMI_STATUS_NOT_SUPPORTED
+          || err == AMDSMI_STATUS_NOT_YET_IMPLEMENTED) {
       IF_VERB(STANDARD) {
         std::cout <<
             "\t** amdsmi_get_gpu_od_volt_info: Not supported on this machine"
                                                                << std::endl;
       }
       // Verify api support checking functionality is working
-      err =  amdsmi_get_gpu_od_volt_info(processor_handles_[i], nullptr);
-      ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED);
+      if (err == AMDSMI_STATUS_NOT_SUPPORTED) {
+        err =  amdsmi_get_gpu_od_volt_info(processor_handles_[i], nullptr);
+        ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED);
+      }
     } else {
       CHK_ERR_ASRT(err)
       // Verify api support checking functionality is working