diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux
index 1a49eda076..c50008f877 100644
--- a/catch/hipTestMain/config/config_amd_linux
+++ b/catch/hipTestMain/config/config_amd_linux
@@ -1329,6 +1329,17 @@
         "=== SWDEV-457316 Below tests are disabled temporarily to avoid combined PSDB ===",
         "Unit_hipGraphAddMemAllocNode_Positive_FreeSeparateGraph",
         "Unit_hipGraphAddMemFreeNode_Negative_NotSupported",
+        "Unit_fp8_compare_host_device - float",
+        "Unit_fp8_compare_host_device - double",
+        "Unit_fp8x2_compare_host_device",
+        "Unit_fp8x2_split_compare",
+        "Unit_fp8x4_split_compare",
+        "Unit_fp8_bool",
+        "Unit_all_fp8_cvt",
+        "Unit_all_fp8_vector_cvt",
+        "Unit_fp8_correctness - float",
+        "Unit_fp8_correctness - double",
+        "Unit_fp8_vector_basic_conversions",
     #endif
     #if defined gfx906
         "=== SWDEV-419112 Below tests fail in stress test on 29/08/23 ===",
diff --git a/catch/hipTestMain/config/config_amd_windows b/catch/hipTestMain/config/config_amd_windows
index 83a4f80ab1..bea27e2bbb 100644
--- a/catch/hipTestMain/config/config_amd_windows
+++ b/catch/hipTestMain/config/config_amd_windows
@@ -1441,6 +1441,17 @@
         "Unit_hipStreamBeginCaptureToGraph_CaptureDepGraph",
         "=== SWDEV-465071 Below test is temporarily disabled due to compiler change ===",
         "Unit_hipClassKernel_Virtual",
+        "Unit_fp8_compare_host_device - float",
+        "Unit_fp8_compare_host_device - double",
+        "Unit_fp8x2_compare_host_device",
+        "Unit_fp8x2_split_compare",
+        "Unit_fp8x4_split_compare",
+        "Unit_fp8_bool",
+        "Unit_all_fp8_cvt",
+        "Unit_all_fp8_vector_cvt",
+        "Unit_fp8_correctness - float",
+        "Unit_fp8_correctness - double",
+        "Unit_fp8_vector_basic_conversions",
     #endif
         "End of json"
     ]