diff --git a/Android.bp b/Android.bp
index aea7efa..804cc57 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,14 +37,18 @@
     ],
 }
 
-rust_defaults {
-    name: "ash_test_defaults",
+rust_test {
+    name: "ash_test_src_lib",
+    host_supported: true,
     crate_name: "ash",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "0.33.3+1.2.191",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -55,21 +59,8 @@
     ],
 }
 
-rust_test_host {
-    name: "ash_host_test_src_lib",
-    defaults: ["ash_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "ash_device_test_src_lib",
-    defaults: ["ash_test_defaults"],
-}
-
 rust_defaults {
-    name: "ash_test_defaults_ash",
+    name: "ash_test_defaults",
     crate_name: "ash",
     cargo_env_compat: true,
     cargo_pkg_version: "0.33.3+1.2.191",
@@ -86,9 +77,10 @@
     ],
 }
 
-rust_test_host {
-    name: "ash_host_test_tests_constant_size_arrays",
-    defaults: ["ash_test_defaults_ash"],
+rust_test {
+    name: "ash_test_tests_constant_size_arrays",
+    defaults: ["ash_test_defaults"],
+    host_supported: true,
     srcs: ["tests/constant_size_arrays.rs"],
     test_options: {
         unit_test: true,
@@ -96,26 +88,15 @@
 }
 
 rust_test {
-    name: "ash_device_test_tests_constant_size_arrays",
-    defaults: ["ash_test_defaults_ash"],
-    srcs: ["tests/constant_size_arrays.rs"],
-}
-
-rust_test_host {
-    name: "ash_host_test_tests_display",
-    defaults: ["ash_test_defaults_ash"],
+    name: "ash_test_tests_display",
+    defaults: ["ash_test_defaults"],
+    host_supported: true,
     srcs: ["tests/display.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "ash_device_test_tests_display",
-    defaults: ["ash_test_defaults_ash"],
-    srcs: ["tests/display.rs"],
-}
-
 rust_library {
     name: "libash_rust",
     stem: "libash",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4addb0a..f439cf8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,19 +1,8 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    // Manually disabled as these tests depend on specific graphics libraries
-    // being available on the machine running the tests.
-    //{
-    //  "name": "ash_device_test_src_lib"
-    //},
-    //{
-    //  "name": "ash_device_test_tests_constant_size_arrays"
-    //},
-    //{
-    //  "name": "ash_device_test_tests_display"
-    //},
-    //{
-    //  "name": "vulkano_device_test_src_lib"
-    //}
+  "imports": [
+    {
+      "path": "external/rust/crates/vulkano"
+    }
   ]
 }