diff --git a/Android.bp b/Android.bp
index 4ce19ec..3f43a90 100644
--- a/Android.bp
+++ b/Android.bp
@@ -182,6 +182,11 @@
         "img2simg",
         "avbtool",
     ],
+    data: [
+        "avbtool",
+        "test/data/*",
+    ],
+    test_config: "test/libavb_host_unittest.xml",
     static_libs: [
         "libavb",
         "libavb_ab_host",
diff --git a/test/libavb_host_unittest.xml b/test/libavb_host_unittest.xml
new file mode 100644
index 0000000..826a758
--- /dev/null
+++ b/test/libavb_host_unittest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Runs libavb_host_unittest.">
+    <option name="null-device" value="true" />
+    <test class="com.android.tradefed.testtype.HostGTest" >
+        <option name="module-name" value="libavb_host_unittest" />
+        <option name="native-test-timeout" value="3m"/>
+    </test>
+</configuration>