diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 4825554..2ffc7ea 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -11,10 +11,9 @@
 Resource               ../lib/state_manager.robot
 Library                ../data/model.py
 
-Suite setup            Setup The Suite
+Suite Setup            Setup The Suite
 Test Setup             Open Connection And Log In
 Test Teardown          Post Test Case Execution
-Suite Teardown         Restore System Configuration
 
 *** Variables ***
 ${model}=    ${OPENBMC_MODEL}
@@ -143,8 +142,9 @@
     # The allowed value for turbo allowed:
     # True  - To enable turbo allowed.
     # False - To disable turbo allowed.
-
+    [Setup]  Turbo Setting Test Case Setup
     [Tags]  Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
+    [Teardown]  Restore System Configuration
 
     ${uri}=  Get System Component  TurboAllowed
     ${sensor_num}=  Get Sensor Number  ${uri}
@@ -162,8 +162,9 @@
     # The allowed value for turbo allowed:
     # True  - To enable turbo allowed.
     # False - To disable turbo allowed.
-
+    [Setup]  Turbo Setting Test Case Setup
     [Tags]  Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
+    [Teardown]  Restore System Configuration
 
     ${uri}=  Get System Component  TurboAllowed
     ${sensor_num}=  Get Sensor Number  ${uri}
@@ -183,7 +184,9 @@
     # True  - To enable turbo allowed.
     # False - To disable turbo allowed.
 
+    [Setup]  Turbo Setting Test Case Setup
     [Tags]  Verify_Setting_OCC_Turbo_Via_REST
+    [Teardown]  Restore System Configuration
 
     Set Turbo Setting Via REST  False
     ${setting}=  Read Turbo Setting Via REST
@@ -193,7 +196,6 @@
     ${setting}=  Read Turbo Setting Via REST
     Should Be Equal  ${setting}  True
 
-
 CPU Present
     [Tags]  CPU_Present
 
@@ -389,6 +391,10 @@
     Set Suite Variable      ${SYSTEM_INFO}          ${resp}
     log Dictionary          ${resp}
 
+Turbo Setting Test Case Setup
+    [Documentation]  Open Connection and turbo settings
+
+    Open Connection And Log In
     ${setting}=  Read Turbo Setting Via REST
     Set Global Variable  ${TURBO_SETTING}  ${setting}