diff --git a/openpower/vpd/test_redfish_vpd.robot b/openpower/vpd/test_redfish_vpd.robot
index 7635e78..2310de8 100644
--- a/openpower/vpd/test_redfish_vpd.robot
+++ b/openpower/vpd/test_redfish_vpd.robot
@@ -4,7 +4,7 @@
 Resource        ../../lib/openbmc_ffdc.robot
 Library         ../../lib/vpd_utils.py
 
-Test Teardown   FFDC On Test Case Fail
+#Test Teardown   FFDC On Test Case Fail
 
 
 *** Test Cases ***
@@ -15,6 +15,7 @@
     [Template]  Verify Redfish VPD Data
 
     # Component
+    System
     BMC
     Chassis
     CPU
@@ -32,6 +33,7 @@
     ...  '${component}' == 'BMC'  /redfish/v1/Managers/bmc
     ...  '${component}' == 'Chassis'  /redfish/v1/Chassis/chassis
     ...  '${component}' == 'CPU'  /redfish/v1/Systems/system/Processors/cpu0
+    ...  '${component}' == 'System'  /redfish/v1/Systems/system
 
     # TODO: Currently serial number is verified. Verification for other fields will be added later.
     Verify Redfish VPD  ${component}  ${component_uri}  SerialNumber
@@ -57,6 +59,7 @@
     ...  '${component}' == 'CPU'  /system/chassis/motherboard/cpu0
     ...  '${component}' == 'Chassis'  /system/chassis
     ...  '${component}' == 'BMC'  /system/chassis/motherboard/ebmc_card_bmc
+    ...  '${component}' == 'System'  /system
 
     ${vpd_records}=  Vpdtool  -r -O ${vpd_component} -R VINI -K ${vpd_field}
     Should Be Equal As Strings  ${resp["SerialNumber"]}  ${vpd_records['${vpd_component}']['${vpd_field}']}