4 files changed, 25 insertions, 4 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index fe9731f..e5c8117 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,5 +3,13 @@
     {
       "name": "NetworkStackTests"
     }
+  ],
+  "postsubmit": [
+    {
+      "name": "NetworkStackHostTests"
+    },
+    {
+      "name": "NetworkStackIntegrationTests"
+    }
   ]
-}
-\ No newline at end of file
+}
diff --git a/tests/hostdriven/Android.bp b/tests/hostdriven/Android.bp
index caa4f2c..ec36424 100644
--- a/tests/hostdriven/Android.bp
+++ b/tests/hostdriven/Android.bp
@@ -25,5 +25,6 @@ java_test_host {
         "kotlin-test",
         "module_test_util",
     ],
+    test_suites: ["device-tests"],
     data: [":NetworkStack"],
 }
diff --git a/tests/lib/Android.bp b/tests/lib/Android.bp
index f45a81c..1d52fa0 100644
--- a/tests/lib/Android.bp
+++ b/tests/lib/Android.bp
@@ -20,7 +20,19 @@ java_library {
         "src/**/*.java",
         "src/**/*.kt",
     ],
+    defaults: ["lib_mockito_extended"],
     static_libs: [
         "kotlin-test",
     ],
 }
+
+java_defaults {
+    name: "lib_mockito_extended",
+    static_libs: [
+        "mockito-target-extended-minus-junit4"
+    ],
+    jni_libs: [
+         "libdexmakerjvmtiagent",
+         "libstaticjvmtiagent",
+    ],
+}
diff --git a/tests/unit/src/android/networkstack/util/FakeDns.kt b/tests/lib/src/android/networkstack/util/FakeDns.kt
index f0d44d0..157b6ce 100644
--- a/tests/unit/src/android/networkstack/util/FakeDns.kt
+++ b/tests/lib/src/android/networkstack/util/FakeDns.kt
@@ -21,7 +21,6 @@ import android.net.InetAddresses
 import android.os.Looper
 import android.os.Handler
 import com.android.internal.annotations.GuardedBy
-import com.android.networkstack.util.DnsUtils.TYPE_ADDRCONFIG
 import java.net.InetAddress
 import java.util.concurrent.Executor
 import org.mockito.invocation.InvocationOnMock
@@ -29,6 +28,7 @@ import org.mockito.Mockito.any
 import org.mockito.Mockito.anyInt
 import org.mockito.Mockito.doAnswer
 
+const val TYPE_UNSPECIFIED = -1
 // TODO: Integrate with NetworkMonitorTest.
 class FakeDns(val mockResolver: DnsResolver) {
     class DnsEntry(val hostname: String, val type: Int, val addresses: List<InetAddress>) {
@@ -78,7 +78,7 @@ class FakeDns(val mockResolver: DnsResolver) {
         val hostname = it.arguments[posHos] as String
         val executor = it.arguments[posExecutor] as Executor
         val callback = it.arguments[posCallback] as DnsResolver.Callback<List<InetAddress>>
-        var type = if (posType != -1) it.arguments[posType] as Int else TYPE_ADDRCONFIG
+        var type = if (posType != -1) it.arguments[posType] as Int else TYPE_UNSPECIFIED
         val answer = getAnswer(hostname, type)
 
         if (!answer?.addresses.isNullOrEmpty()) {
@@ -91,4 +91,4 @@ class FakeDns(val mockResolver: DnsResolver) {
     fun clearAll() = synchronized(answers) {
         answers.clear()
     }
-}
-\ No newline at end of file
+}