diff --git a/Android.bp b/Android.bp
index d5c8d78..2800012 100644
--- a/Android.bp
+++ b/Android.bp
@@ -100,6 +100,25 @@
 }
 
 rust_test_host {
+    name: "xml-rs_host_test_tests_event_writer",
+    defaults: ["xml-rs_test_defaults_xml_rs"],
+    // has rustc warnings
+    srcs: ["tests/event_writer.rs"],
+    test_options: {
+        unit_test: true,
+    },
+    data: ["tests/documents/*"],
+}
+
+rust_test {
+    name: "xml-rs_device_test_tests_event_writer",
+    defaults: ["xml-rs_test_defaults_xml_rs"],
+    // has rustc warnings
+    srcs: ["tests/event_writer.rs"],
+    data: ["tests/documents/*"],
+}
+
+rust_test_host {
     name: "xml-rs_host_test_tests_streaming",
     defaults: ["xml-rs_test_defaults_xml_rs"],
     // has rustc warnings
diff --git a/cargo2android.json b/cargo2android.json
index 6ddd73e..d63dca0 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,8 +8,6 @@
   ],
   "device": true,
   "run": true,
-  "test-blocklist": [
-    "tests/event_writer.rs"
-  ],
-  "tests": true
+  "tests": true,
+  "patch": "patches/Android.bp.patch"
 }
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..465a940
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,20 @@
+diff --git a/Android.bp b/Android.bp
+index 15bae6d..2800012 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -107,6 +107,7 @@ rust_test_host {
+     test_options: {
+         unit_test: true,
+     },
++    data: ["tests/documents/*"],
+ }
+ 
+ rust_test {
+@@ -114,6 +115,7 @@ rust_test {
+     defaults: ["xml-rs_test_defaults_xml_rs"],
+     // has rustc warnings
+     srcs: ["tests/event_writer.rs"],
++    data: ["tests/documents/*"],
+ }
+ 
+ rust_test_host {