diff --git a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
index 83115b9..0055f7e 100644
--- a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
@@ -2429,7 +2429,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId
diff --git a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
index 6a8283f..288da84 100644
--- a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
+++ b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
@@ -2436,7 +2436,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId
diff --git a/TestON/tests/HA/HAkillNodes/HAkillNodes.py b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
index 31bab52..1fe9f84 100644
--- a/TestON/tests/HA/HAkillNodes/HAkillNodes.py
+++ b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
@@ -2491,7 +2491,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId
diff --git a/TestON/tests/HA/HAsanity/HAsanity.py b/TestON/tests/HA/HAsanity/HAsanity.py
index 52f0b49..d30bdbc 100644
--- a/TestON/tests/HA/HAsanity/HAsanity.py
+++ b/TestON/tests/HA/HAsanity/HAsanity.py
@@ -2352,7 +2352,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId
diff --git a/TestON/tests/HA/HAscaling/HAscaling.py b/TestON/tests/HA/HAscaling/HAscaling.py
index 6e13d85..aba291c 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.py
+++ b/TestON/tests/HA/HAscaling/HAscaling.py
@@ -2494,7 +2494,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId
diff --git a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index 42d88fe..ede3075 100644
--- a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -1758,7 +1758,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId
diff --git a/TestON/tests/HA/HAstopNodes/HAstopNodes.py b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
index 6b86378..20d2419 100644
--- a/TestON/tests/HA/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
@@ -2465,7 +2465,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.py b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
index 0811287..d75ccdd 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.py
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
@@ -2488,7 +2488,7 @@
                                 mac = host.get( 'mac' )
                                 assert mac, "mac field could not be found for this host object"
 
-                                location = host.get( 'location' )
+                                location = host.get( 'locations' )[ 0 ]
                                 assert location, "location field could not be found for this host object"
 
                                 # Trim the protocol identifier off deviceId