diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 03296e7..74aafd3 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -59,6 +59,7 @@
         "//packages/modules/NetworkStack:__subpackages__",
         "//packages/modules/CaptivePortalLogin",
         "//frameworks/libs/net/common/tests:__subpackages__",
+        "//frameworks/libs/net/common/testutils:__subpackages__",
   ],
   static_libs: [
       "net-utils-framework-common",
@@ -68,25 +69,6 @@
   ],
 }
 
-java_library {
-  // Consider using net-tests-utils instead if writing device code.
-  // That library has a lot more useful tools into it for users that
-  // work on Android and includes this lib.
-  name: "net-tests-utils-host-device-common",
-  srcs: [
-      "hostdevice/**/*.java",
-      "hostdevice/**/*.kt",
-  ],
-  host_supported: true,
-  visibility: [
-      "//frameworks/libs/net/common/tests:__subpackages__",
-      "//frameworks/libs/net/client-libs/tests:__subpackages__",
-  ],
-  static_libs: [
-      "kotlin-test"
-  ]
-}
-
 java_defaults {
     name: "lib_mockito_extended",
     static_libs: [
@@ -98,25 +80,6 @@
     ],
 }
 
-java_library {
-    name: "net-tests-utils",
-    srcs: [
-        "devicetests/**/*.java",
-        "devicetests/**/*.kt",
-    ],
-    defaults: ["lib_mockito_extended"],
-    libs: [
-        "androidx.annotation_annotation",
-    ],
-    static_libs: [
-        "androidx.test.ext.junit",
-        "kotlin-reflect",
-        "libnanohttpd",
-        "net-tests-utils-host-device-common",
-        "net-utils-device-common",
-    ],
-}
-
 filegroup {
     name: "net-utils-framework-common-srcs",
     srcs: ["framework/**/*.java"],
diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp
new file mode 100644
index 0000000..bea5e5a
--- /dev/null
+++ b/staticlibs/testutils/Android.bp
@@ -0,0 +1,51 @@
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_library {
+    name: "net-tests-utils",
+    srcs: [
+        "devicetests/**/*.java",
+        "devicetests/**/*.kt",
+    ],
+    defaults: ["lib_mockito_extended"],
+    libs: [
+        "androidx.annotation_annotation",
+    ],
+    static_libs: [
+        "androidx.test.ext.junit",
+        "kotlin-reflect",
+        "libnanohttpd",
+        "net-tests-utils-host-device-common",
+        "net-utils-device-common",
+    ],
+}
+
+java_library {
+  // Consider using net-tests-utils instead if writing device code.
+  // That library has a lot more useful tools into it for users that
+  // work on Android and includes this lib.
+  name: "net-tests-utils-host-device-common",
+  srcs: [
+      "hostdevice/**/*.java",
+      "hostdevice/**/*.kt",
+  ],
+  host_supported: true,
+  visibility: [
+      "//frameworks/libs/net/common/tests:__subpackages__",
+      "//frameworks/libs/net/client-libs/tests:__subpackages__",
+  ],
+  static_libs: [
+      "kotlin-test"
+  ]
+}
diff --git a/staticlibs/devicetests/com/android/testutils/ArpResponder.kt b/staticlibs/testutils/devicetests/com/android/testutils/ArpResponder.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/ArpResponder.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/ArpResponder.kt
diff --git a/staticlibs/devicetests/com/android/testutils/CompatUtil.kt b/staticlibs/testutils/devicetests/com/android/testutils/CompatUtil.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/CompatUtil.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/CompatUtil.kt
diff --git a/staticlibs/devicetests/com/android/testutils/ConcurrentInterpreter.kt b/staticlibs/testutils/devicetests/com/android/testutils/ConcurrentInterpreter.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/ConcurrentInterpreter.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/ConcurrentInterpreter.kt
diff --git a/staticlibs/devicetests/com/android/testutils/DevSdkIgnoreRule.kt b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
diff --git a/staticlibs/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt
diff --git a/staticlibs/devicetests/com/android/testutils/FakeDns.kt b/staticlibs/testutils/devicetests/com/android/testutils/FakeDns.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/FakeDns.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/FakeDns.kt
diff --git a/staticlibs/devicetests/com/android/testutils/HandlerUtils.kt b/staticlibs/testutils/devicetests/com/android/testutils/HandlerUtils.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/HandlerUtils.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/HandlerUtils.kt
diff --git a/staticlibs/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java b/staticlibs/testutils/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java
rename to staticlibs/testutils/devicetests/com/android/testutils/NetworkStatsProviderCbStubCompat.java
diff --git a/staticlibs/devicetests/com/android/testutils/NetworkStatsProviderStubCompat.java b/staticlibs/testutils/devicetests/com/android/testutils/NetworkStatsProviderStubCompat.java
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/NetworkStatsProviderStubCompat.java
rename to staticlibs/testutils/devicetests/com/android/testutils/NetworkStatsProviderStubCompat.java
diff --git a/staticlibs/devicetests/com/android/testutils/NetworkStatsUtils.kt b/staticlibs/testutils/devicetests/com/android/testutils/NetworkStatsUtils.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/NetworkStatsUtils.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/NetworkStatsUtils.kt
diff --git a/staticlibs/devicetests/com/android/testutils/PacketResponder.kt b/staticlibs/testutils/devicetests/com/android/testutils/PacketResponder.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/PacketResponder.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/PacketResponder.kt
diff --git a/staticlibs/devicetests/com/android/testutils/ParcelUtils.kt b/staticlibs/testutils/devicetests/com/android/testutils/ParcelUtils.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/ParcelUtils.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/ParcelUtils.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TapPacketReader.java b/staticlibs/testutils/devicetests/com/android/testutils/TapPacketReader.java
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TapPacketReader.java
rename to staticlibs/testutils/devicetests/com/android/testutils/TapPacketReader.java
diff --git a/staticlibs/devicetests/com/android/testutils/TapPacketReaderRule.kt b/staticlibs/testutils/devicetests/com/android/testutils/TapPacketReaderRule.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TapPacketReaderRule.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TapPacketReaderRule.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TestHttpServer.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestHttpServer.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TestHttpServer.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TestHttpServer.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TestNetworkTracker.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TestNetworkTracker.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TestPermissionUtil.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestPermissionUtil.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TestPermissionUtil.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TestPermissionUtil.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TestableNetworkStatsProviderBinder.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderBinder.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TestableNetworkStatsProviderBinder.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderBinder.kt
diff --git a/staticlibs/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
similarity index 100%
rename from staticlibs/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
rename to staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProviderCbBinder.kt
diff --git a/staticlibs/hostdevice/com/android/net/module/util/TrackRecord.kt b/staticlibs/testutils/hostdevice/com/android/net/module/util/TrackRecord.kt
similarity index 100%
rename from staticlibs/hostdevice/com/android/net/module/util/TrackRecord.kt
rename to staticlibs/testutils/hostdevice/com/android/net/module/util/TrackRecord.kt
diff --git a/staticlibs/hostdevice/com/android/testutils/ConcurrentUtils.kt b/staticlibs/testutils/hostdevice/com/android/testutils/ConcurrentUtils.kt
similarity index 100%
rename from staticlibs/hostdevice/com/android/testutils/ConcurrentUtils.kt
rename to staticlibs/testutils/hostdevice/com/android/testutils/ConcurrentUtils.kt
diff --git a/staticlibs/hostdevice/com/android/testutils/ExceptionUtils.java b/staticlibs/testutils/hostdevice/com/android/testutils/ExceptionUtils.java
similarity index 100%
rename from staticlibs/hostdevice/com/android/testutils/ExceptionUtils.java
rename to staticlibs/testutils/hostdevice/com/android/testutils/ExceptionUtils.java
diff --git a/staticlibs/hostdevice/com/android/testutils/FileUtils.kt b/staticlibs/testutils/hostdevice/com/android/testutils/FileUtils.kt
similarity index 100%
rename from staticlibs/hostdevice/com/android/testutils/FileUtils.kt
rename to staticlibs/testutils/hostdevice/com/android/testutils/FileUtils.kt
diff --git a/staticlibs/hostdevice/com/android/testutils/MiscAsserts.kt b/staticlibs/testutils/hostdevice/com/android/testutils/MiscAsserts.kt
similarity index 100%
rename from staticlibs/hostdevice/com/android/testutils/MiscAsserts.kt
rename to staticlibs/testutils/hostdevice/com/android/testutils/MiscAsserts.kt
diff --git a/staticlibs/hostdevice/com/android/testutils/PacketFilter.kt b/staticlibs/testutils/hostdevice/com/android/testutils/PacketFilter.kt
similarity index 100%
rename from staticlibs/hostdevice/com/android/testutils/PacketFilter.kt
rename to staticlibs/testutils/hostdevice/com/android/testutils/PacketFilter.kt
diff --git a/staticlibs/hostdevice/com/android/testutils/SkipPresubmit.kt b/staticlibs/testutils/hostdevice/com/android/testutils/SkipPresubmit.kt
similarity index 100%
rename from staticlibs/hostdevice/com/android/testutils/SkipPresubmit.kt
rename to staticlibs/testutils/hostdevice/com/android/testutils/SkipPresubmit.kt