diff --git a/server/site_tests/network_WiFiChaosOpen/control.debug b/server/site_tests/network_WiFiChaosOpen/control.debug
index c711840..b537e9e 100644
--- a/server/site_tests/network_WiFiChaosOpen/control.debug
+++ b/server/site_tests/network_WiFiChaosOpen/control.debug
@@ -21,7 +21,7 @@
 def run_chaos_open(machine):
     host = hosts.create_host(machine)
     # List of specific APs to debug.
-    debug_aps = ['chromeos3-row1-rack1-host6', 'chromeos3-row1-rack1-host7']
+    debug_aps = ['chromeos3-row2-rack1-host2', 'chromeos3-row2-rack1-host3']
     helper = chaos_interop_test.WifiChaosTest('network_WiFiChaosOpen', host)
     helper.run(job, ap_spec={'hostnames': debug_aps}, batch_size=2, tries=1)
 
diff --git a/server/site_tests/network_WiFiChaosPSK/control.debug b/server/site_tests/network_WiFiChaosPSK/control.debug
index 81f7957..efaa5f4 100644
--- a/server/site_tests/network_WiFiChaosPSK/control.debug
+++ b/server/site_tests/network_WiFiChaosPSK/control.debug
@@ -21,7 +21,7 @@
 def run_chaos_psk(machine):
     host = hosts.create_host(machine)
     # List of specific APs to debug. Please verify the APs indeed support PSK.
-    debug_aps = ['chromeos3-row1-rack1-host6', 'chromeos3-row1-rack1-host7']
+    debug_aps = ['chromeos3-row2-rack1-host2', 'chromeos3-row2-rack1-host3']
     helper = chaos_interop_test.WifiChaosTest('network_WiFiChaosPSK', host)
     # capture_host: string hostname or IP of packet_capturer not managed in AFE
     #   NOTE: if capture_host is specified, it will not be locked in AFE