diff --git a/Android.bp b/Android.bp
index a906b5a..4d1a9e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,17 +71,21 @@
     ],
 }
 
-rust_defaults {
-    name: "oid-registry_test_defaults",
+rust_test {
+    name: "oid-registry_test_src_lib",
+    host_supported: true,
     crate_name: "oid_registry",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.0",
     srcs: [
         "src/lib.rs",
         ":copy_oid-registry_build_out",
     ],
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.2.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "crypto",
@@ -98,16 +102,3 @@
         "libder_parser",
     ],
 }
-
-rust_test_host {
-    name: "oid-registry_host_test_src_lib",
-    defaults: ["oid-registry_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "oid-registry_device_test_src_lib",
-    defaults: ["oid-registry_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 587e8a5..ecf0f4a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,7 +11,21 @@
       "name": "microdroid_manager_test"
     },
     {
-      "name": "oid-registry_device_test_src_lib"
+      "name": "oid-registry_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "oid-registry_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 69d8a6b..183bd42 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -4,4 +4,4 @@
   "features": "crypto,x509",
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file