diff --git a/data/variables.py b/data/variables.py
index 22bba32..245c3dd 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -163,10 +163,6 @@
 REDFISH_CHASSIS_THERMAL_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_THERMAL
 REDFISH_CHASSIS_POWER = 'chassis/Power/'
 REDFISH_CHASSIS_POWER_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_POWER
-REDFISH_CHASSIS_PSUPPLY0 = 'powersupply0/Power/'
-REDFISH_CHASSIS_PSUPPLY1 = 'powersupply1/Power/'
-REDFISH_CHASSIS_PSUPPLY0_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_PSUPPLY0
-REDFISH_CHASSIS_PSUPPLY1_URI = REDFISH_CHASSIS_URI + REDFISH_CHASSIS_PSUPPLY1
 
 # Boot options and URI variables.
 POWER_ON = 'On'
diff --git a/redfish/systems/test_powersupply_readings.robot b/redfish/systems/test_powersupply_readings.robot
index 835a288..e9c9fba 100755
--- a/redfish/systems/test_powersupply_readings.robot
+++ b/redfish/systems/test_powersupply_readings.robot
@@ -20,8 +20,7 @@
     [Template]  Verify Watts Record
 
     # record_type   redfish_uri                       reading_type
-    PowerSupplies   ${REDFISH_CHASSIS_PSUPPLY0_URI}   PowerInputWatts
-    PowerSupplies   ${REDFISH_CHASSIS_PSUPPLY1_URI}   PowerInputWatts
+    PowerSupplies   ${REDFISH_CHASSIS_POWER_URI}      PowerInputWatts
 
 
 Verify Power Supplies Input Output Voltages
@@ -30,8 +29,7 @@
     [Template]  Verify Voltage Records
 
     # record_type   redfish_uri                        reading_type
-    Voltages        ${REDFISH_CHASSIS_PSUPPLY0_URI}    ReadingVolts
-    Voltages        ${REDFISH_CHASSIS_PSUPPLY1_URI}    ReadingVolts
+    Voltages        ${REDFISH_CHASSIS_POWER_URI}       ReadingVolts
 
 
 *** Keywords ***
@@ -42,7 +40,7 @@
 
     # Description of Arguments(s):
     # record_type    The sensor record type (e.g. "PowerSupplies")
-    # redfish_uri    The power supply URI (e.g. /redfish/v1/Chassis/powersupply0/Power)
+    # redfish_uri    The power supply URI (e.g. /redfish/v1/Chassis/chassis/Power)
     # reading_type   The power watt readings (e.g. "PowerInputWatts")
 
     Verify Valid Records  ${record_type}  ${redfish_uri}  ${reading_type}
@@ -54,7 +52,7 @@
 
     # Description of Arguments(s):
     # record_type    The sensor record type (e.g. "Voltages")
-    # redfish_uri    The power supply URI (e.g. /redfish/v1/Chassis/powersupply0/Power)
+    # redfish_uri    The power supply URI (e.g. /redfish/v1/Chassis/chassis/Power)
     # reading_type   The power voltage readings (e.g. "ReadingVolts")
 
     Verify Valid Records  ${record_type}  ${redfish_uri}  ${reading_type}
@@ -77,7 +75,7 @@
 
     # Description of Arguments(s):
     # record_type    The sensor record type (e.g. "PowerSupplies")
-    # redfish_uri    The power supply URI (e.g. /redfish/v1/Chassis/powersupply0/Power)
+    # redfish_uri    The power supply URI (e.g. /redfish/v1/Chassis/chassis/Power)
     # reading_type   The power watt readings (e.g. "PowerInputWatts")
 
     # A valid record will have "State" key "Enabled" and "Health" key "OK".
@@ -106,7 +104,7 @@
     [Documentation]  Do test case setup tasks.
 
     Printn
-    Redfish Power On
+    Redfish Power On  stack_mode=skip
     Redfish.Login