diff --git a/TestON/tests/HA/HAscaling/HAscaling.py b/TestON/tests/HA/HAscaling/HAscaling.py
index d4cf53d..112306a 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.py
+++ b/TestON/tests/HA/HAscaling/HAscaling.py
@@ -275,7 +275,8 @@
 
         main.step( "Set up ONOS secure SSH" )
         secureSshResult = main.TRUE
-        for node in main.nodes:
+        for i in range( main.numCtrls ):
+            node = main.nodes[i]
             secureSshResult = secureSshResult and main.ONOSbench.onosSecureSSH( node=node.ip_address )
         utilities.assert_equals( expect=main.TRUE, actual=secureSshResult,
                                  onpass="Test step PASS",
@@ -1898,6 +1899,7 @@
             onosIsupResult = main.TRUE
             for i in main.activeNodes:
                 node = main.nodes[i]
+                main.ONOSbench.onosSecureSSH( node=node.ip_address )
                 started = main.ONOSbench.isup( node.ip_address )
                 if not started:
                     main.log.error( node.name + " didn't start!" )
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.py b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
index 082f831..1be977a 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.py
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
@@ -269,7 +269,8 @@
 
         main.step( "Set up ONOS secure SSH" )
         secureSshResult = main.TRUE
-        for node in main.nodes:
+        for i in range( main.numCtrls ):
+            node = main.nodes[i]
             secureSshResult = secureSshResult and main.ONOSbench.onosSecureSSH( node=node.ip_address )
         utilities.assert_equals( expect=main.TRUE, actual=secureSshResult,
                                  onpass="Test step PASS",
@@ -1886,6 +1887,7 @@
             onosIsupResult = main.TRUE
             for i in main.activeNodes:
                 node = main.nodes[i]
+                main.ONOSbench.onosSecureSSH( node=node.ip_address )
                 started = main.ONOSbench.isup( node.ip_address )
                 if not started:
                     main.log.error( node.name + " didn't start!" )