diff --git a/acts/tests/google/wifi/WifiStressTest.py b/acts/tests/google/wifi/WifiStressTest.py
index 9e37061..863d4d5 100755
--- a/acts/tests/google/wifi/WifiStressTest.py
+++ b/acts/tests/google/wifi/WifiStressTest.py
@@ -242,6 +242,9 @@
             4. Verify softAP is turned down and WiFi is up.
 
         """
+        # Set country code explicitly to "US".
+        self.dut.droid.wifiSetCountryCode(wutils.WifiEnums.CountryCode.US)
+        self.dut_client.droid.wifiSetCountryCode(wutils.WifiEnums.CountryCode.US)
         ap_ssid = "softap_" + utils.rand_ascii_str(8)
         ap_password = utils.rand_ascii_str(8)
         self.dut.log.info("softap setup: %s %s", ap_ssid, ap_password)
diff --git a/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py b/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
index b2120f9..f6d7c8d 100644
--- a/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
+++ b/acts/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
@@ -1464,6 +1464,7 @@
                         "Discovery with ranging for FF expected!")
 
 
+  @test_tracker_info(uuid="6700eab8-a172-43cd-aed3-e6577ce8fd89")
   def test_discovery_direct_concurrency(self):
     """Verify the behavior of Wi-Fi Aware Ranging used as part of discovery and
     as direct ranging to a peer device.
diff --git a/acts/tests/google/wifi/rtt/functional/RttDisableTest.py b/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
index 3672288..cb8ade3 100644
--- a/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
+++ b/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
@@ -20,9 +20,10 @@
 from acts.test_utils.wifi.rtt import rtt_const as rconsts
 from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
 from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
 
 
-class RttDisableTest(RttBaseTest):
+class RttDisableTest(WifiBaseTest, RttBaseTest):
   """Test class for RTT ranging enable/disable flows."""
 
   MODE_DISABLE_WIFI = 0
@@ -30,7 +31,10 @@
   MODE_DISABLE_LOCATIONING = 2
 
   def __init__(self, controllers):
+    WifiBaseTest.__init__(self, controllers)
     RttBaseTest.__init__(self, controllers)
+    if "AccessPoint" in self.user_params:
+      self.legacy_configure_ap_and_start()
 
   def run_disable_rtt(self, disable_mode):
     """Validate the RTT disabled flows: whether by disabling Wi-Fi or entering