diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index 1600a6a0ec..4ecb23c043 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -158,6 +158,7 @@ java_defaults {
     // Tests must check a large number of deprecated methods and warning about it
     // sends hundreds of warning lines flooding the useful warnings.
     kotlincflags: ["-Xsuppress-warning=DEPRECATION"],
+    // TODO: add "-Xwarning-level=CheckResult:error" when Kotlin 2.2.0 is out
 }
 
 // defaults for tests that need to build against framework-connectivity's @hide APIs, but also
@@ -184,6 +185,7 @@ java_defaults {
     // Tests must check a large number of deprecated methods and warning about it
     // sends hundreds of warning lines flooding the useful warnings.
     kotlincflags: ["-Xsuppress-warning=DEPRECATION"],
+    // TODO: add "-Xwarning-level=CheckResult:error" when Kotlin 2.2.0 is out
     defaults_visibility: ["//packages/modules/Connectivity/tests:__subpackages__"],
 }
 
diff --git a/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt
index 19a40f9502..97556f54a2 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt
@@ -104,7 +104,7 @@ class NsdManagerDownstreamTetheringTest : EthernetTetheringTestBase() {
             nsdManager.discoverServices(serviceType, NsdManager.PROTOCOL_DNS_SD, discoveryRecord)
             discoveryRecord.expectCallback<NsdDiscoveryRecord.DiscoveryEvent.DiscoveryStarted>()
             assertNotNull(downstreamReader.pollForQuery("$serviceType.local", 12 /* type PTR */))
-        } cleanupStep {
+        } cleanup {
             nsdManager.stopServiceDiscovery(discoveryRecord)
             discoveryRecord.expectCallback<NsdDiscoveryRecord.DiscoveryEvent.DiscoveryStopped>()
         }
@@ -137,7 +137,7 @@ class NsdManagerDownstreamTetheringTest : EthernetTetheringTestBase() {
             val downstreamReader = downstreamIface.packetReader
             assertNotNull(downstreamReader.pollForQuery("$serviceType.local", 12 /* type PTR */))
             // TODO: Add another test to check packet reply can trigger serviceFound.
-        } cleanupStep {
+        } cleanup {
             nsdManager.stopServiceDiscovery(discoveryRecord)
             discoveryRecord.expectCallback<NsdDiscoveryRecord.DiscoveryEvent.DiscoveryStopped>()
         }