diff --git a/tests/rocm_smi_test/functional/overdrive_read.cc b/tests/rocm_smi_test/functional/overdrive_read.cc
index b3450d60fc..9dbd9bf2d5 100755
--- a/tests/rocm_smi_test/functional/overdrive_read.cc
+++ b/tests/rocm_smi_test/functional/overdrive_read.cc
@@ -86,6 +86,7 @@ void TestOverdriveRead::Close() {
 
 
 void TestOverdriveRead::Run(void) {
+  GTEST_SKIP_("Temporarily disabled due to kernel issue");
   rsmi_status_t err;
   uint32_t val_ui32;
 
@@ -99,6 +100,16 @@ void TestOverdriveRead::Run(void) {
     PrintDeviceHeader(i);
 
     err = rsmi_dev_overdrive_level_get(i, &val_ui32);
+    if (err == RSMI_STATUS_NOT_SUPPORTED) {
+      IF_VERB(STANDARD) {
+        std::cout <<
+          "\t**Overdrive Level get is not supported on this machine" << std::endl;
+      }
+      // Verify api support checking functionality is working
+      err = rsmi_dev_overdrive_level_get(i, nullptr);
+      ASSERT_EQ(err, RSMI_STATUS_NOT_SUPPORTED);
+      continue;
+    }
     CHK_ERR_ASRT(err)
     IF_VERB(STANDARD) {
     std::cout << "\t**OverDrive Level:" << val_ui32 << std::endl;
diff --git a/tests/rocm_smi_test/functional/overdrive_read_write.cc b/tests/rocm_smi_test/functional/overdrive_read_write.cc
index a5d2426f7b..2b1cb36d5c 100755
--- a/tests/rocm_smi_test/functional/overdrive_read_write.cc
+++ b/tests/rocm_smi_test/functional/overdrive_read_write.cc
@@ -85,6 +85,7 @@ void TestOverdriveReadWrite::Close() {
 
 
 void TestOverdriveReadWrite::Run(void) {
+  GTEST_SKIP_("Temporarily disabled due to kernel issue");
   rsmi_status_t ret;
   uint32_t val;
 
@@ -101,12 +102,21 @@ void TestOverdriveReadWrite::Run(void) {
       std::cout << "Set Overdrive level to 0%..." << std::endl;
     }
     ret = rsmi_dev_overdrive_level_set(dv_ind, 0);
+    if (ret == RSMI_STATUS_NOT_SUPPORTED) {
+      IF_VERB(STANDARD) {
+        std::cout <<
+          "\t**Overdrive Level set is not supported on this machine" << std::endl;
+      }
+      continue;
+    }
     CHK_ERR_ASRT(ret)
     IF_VERB(STANDARD) {
       std::cout << "Set Overdrive level to 10%..." << std::endl;
     }
     ret = rsmi_dev_overdrive_level_set(dv_ind, 10);
     CHK_ERR_ASRT(ret)
+    // this won't be reachable if set doesn't work
+    // and is checked by overdrive_read.cc test
     ret = rsmi_dev_overdrive_level_get(dv_ind, &val);
     CHK_ERR_ASRT(ret)
     IF_VERB(STANDARD) {