diff --git a/tests/test_error_log.robot b/extended/test_error_log.robot
similarity index 100%
rename from tests/test_error_log.robot
rename to extended/test_error_log.robot
diff --git a/test_lists/skip_test b/test_lists/skip_test
index ef450f0..a3d4b19 100644
--- a/test_lists/skip_test
+++ b/test_lists/skip_test
@@ -33,3 +33,10 @@
 -e eSEL_Logging
 #openbmc/openbmc-test-automation/issues/396
 -e NetworkManager
+# NA until support for debug tarball is enabled
+-e Create_Test_Error_Callout_And_Verify
+# NA until VPD is programmed on systems
+-e Verify_Chassis_Motherboard_Properties
+#https://github.com/openbmc/openbmc-test-automation/issues/546
+-e CPU_Present
+-e DIMM3_Present
diff --git a/test_lists/skip_test_barreleye b/test_lists/skip_test_barreleye
index 7c034c3..db47dfc 100644
--- a/test_lists/skip_test_barreleye
+++ b/test_lists/skip_test_barreleye
@@ -35,3 +35,10 @@
 -e LED_Group
 #https://github.com/openbmc/openbmc/issues/1283
 -e Inventory
+# NA until support for debug tarball is enabled
+-e Create_Test_Error_Callout_And_Verify
+# NA until VPD is programmed on systems
+-e Verify_Chassis_Motherboard_Properties
+#https://github.com/openbmc/openbmc-test-automation/issues/546
+-e CPU_Present
+-e DIMM3_Present
diff --git a/test_lists/skip_test_palmetto b/test_lists/skip_test_palmetto
index b5d5eb7..fb01a52 100644
--- a/test_lists/skip_test_palmetto
+++ b/test_lists/skip_test_palmetto
@@ -40,3 +40,10 @@
 -e LED_Group
 #https://github.com/openbmc/openbmc/issues/1283
 -e Inventory
+# NA until support for debug tarball is enabled
+-e Create_Test_Error_Callout_And_Verify
+# NA until VPD is programmed on systems
+-e Verify_Chassis_Motherboard_Properties
+#https://github.com/openbmc/openbmc-test-automation/issues/546
+-e CPU_Present
+-e DIMM3_Present
diff --git a/test_lists/skip_test_witherspoon b/test_lists/skip_test_witherspoon
index db6c080..0f83acd 100644
--- a/test_lists/skip_test_witherspoon
+++ b/test_lists/skip_test_witherspoon
@@ -41,3 +41,10 @@
 -e NetworkManager
 # System LED test are NA for Witherspoon system.
 -e System_LED
+# NA until support for debug tarball is enabled
+-e Create_Test_Error_Callout_And_Verify
+# NA until VPD is programmed on systems
+-e Verify_Chassis_Motherboard_Properties
+#https://github.com/openbmc/openbmc-test-automation/issues/546
+-e CPU_Present
+-e DIMM3_Present
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 3967345..a62b018 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -138,16 +138,6 @@
     Read The Attribute  ${uri}    present
     Response Should Be Equal    False
 
-CPU Fault
-    [Tags]  CPU_Fault
-
-    ${uri}=    Get System component    cpu
-    ${x}=      Get Inventory Sensor Number   ${uri}
-
-    Run IPMI command  0x04 0x30 ${x} 0xa9 0xff 0x00 0x01 0x00 0x00 0x00 0x20 0x00
-    Read The Attribute  ${uri}    fault
-    Response Should Be Equal    True
-
 CPU No Fault
     [Tags]  CPU_No_Fault
 
@@ -218,15 +208,6 @@
     Read The Attribute   ${uri}     present
     Response Should Be Equal    False
 
-DIMM0 fault
-    [Tags]    DIMM0_fault
-    ${uri}=    Get System component    dimm0
-    ${x}=      Get Inventory Sensor Number   ${uri}
-
-    Run IPMI command  0x04 0x30 ${x} 0x00 0x00 0x10 0x00 0x00 0x00 0x00 0x20 0x00
-    Read The Attribute   ${uri}     fault
-    Response Should Be Equal    True
-
 DIMM0 no fault
     [Tags]    DIMM0_no_fault
     ${uri}=    Get System component    dimm0