diff --git a/common/OpTestSystem.py b/common/OpTestSystem.py
index e472e78f3..0bccb45c5 100644
--- a/common/OpTestSystem.py
+++ b/common/OpTestSystem.py
@@ -41,6 +41,8 @@
 from OpTestError import OpTestError
 from OpTestHost import OpTestHost
 from OpTestUtil import OpTestUtil
+from OpTestHost import SSHConnectionState
+
 
 class OpSystemState():
     UNKNOWN = 0
@@ -217,6 +219,7 @@ def run_OS(self, state):
     def run_POWERING_OFF(self, state):
         if int(self.sys_wait_for_standby_state(BMC_CONST.SYSTEM_STANDBY_STATE_DELAY)) == 0:
             print "System is in standby/Soft-off state"
+            self.cv_HOST.ssh.state = SSHConnectionState.DISCONNECTED
             return OpSystemState.OFF
         else:
             l_msg = "System failed to reach standby/Soft-off state"
diff --git a/testcases/fspTODCorruption.py b/testcases/fspTODCorruption.py
index 8154db0d4..ee15e4700 100644
--- a/testcases/fspTODCorruption.py
+++ b/testcases/fspTODCorruption.py
@@ -112,10 +112,8 @@ def runTest(self):
         self.tearDown()
         self.cv_SYSTEM.goto_state(OpSystemState.OFF)
         self.cv_SYSTEM.goto_state(OpSystemState.OS)
-        self.cv_HOST.ssh.state = SSHConnectionState.DISCONNECTED
         self.check_hwclock()
         self.cv_SYSTEM.goto_state(OpSystemState.OFF)
-        self.cv_HOST.ssh.state = SSHConnectionState.DISCONNECTED
         self.set_tod()
         self.cv_SYSTEM.goto_state(OpSystemState.OS)
         self.check_hwclock()