diff --git a/Android.bp b/Android.bp
index 786e7b3..c5a968a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -111,6 +111,12 @@
             enabled: true,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 // Tests.
diff --git a/OWNERS b/OWNERS
index fcc567a..ff7a6cf 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,3 @@
+enh@google.com
 narayan@google.com
+xunchang@google.com
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..c59ab08
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,13 @@
+{
+  "presubmit": [
+    {
+      "name": "ziparchive-tests"
+    }
+  ],
+
+  "postsubmit": [
+    {
+      "name": "ziparchive_tests_large"
+    }
+  ]
+}