diff --git a/Android.bp b/Android.bp
index b1a778c..84de9fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8,4 +8,5 @@
     "app",
     "libs/minikin",
     "sample",
+    "tests",
 ]
diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp
index 444bd9a..1109280 100644
--- a/libs/minikin/Android.bp
+++ b/libs/minikin/Android.bp
@@ -21,6 +21,13 @@
     tool_files: ["unicode_emoji_h_gen.py"],
 }
 
+cc_library_headers {
+    name: "libminikin-headers-for-tests",
+    export_include_dirs: ["."],
+    shared_libs: ["libharfbuzz_ng"],
+    export_shared_lib_headers: ["libharfbuzz_ng"],
+}
+
 cc_library {
     name: "libminikin",
     host_supported: true,
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..895cd2a
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,86 @@
+// Copyright (C) 2015 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.
+
+// see how_to_run.txt for instructions on running these tests
+
+cc_test {
+    name: "minikin_tests",
+    data: [
+        "data/BoldItalic.ttf",
+        "data/Bold.ttf",
+        "data/ColorEmojiFont.ttf",
+        "data/ColorTextMixedEmojiFont.ttf",
+        "data/Emoji.ttf",
+        "data/Italic.ttf",
+        "data/Ja.ttf",
+        "data/Ko.ttf",
+        "data/NoGlyphFont.ttf",
+        "data/Regular.ttf",
+        "data/TextEmojiFont.ttf",
+        "data/VarioationSelectorTest-Regular.ttf",
+        "data/ZhHans.ttf",
+        "data/ZhHant.ttf",
+        "data/itemize.xml",
+        "data/emoji.xml",
+    ],
+
+    static_libs: [
+        "libminikin",
+        "libxml2",
+    ],
+
+    // Shared libraries which are dependencies of minikin; these are not automatically
+    // pulled in by the build system (and thus sadly must be repeated).
+    shared_libs: [
+        "libskia",
+        "libft2",
+        "libharfbuzz_ng",
+        "libicuuc",
+        "liblog",
+        "libutils",
+        "libz",
+    ],
+
+    srcs: [
+        "FontCollectionTest.cpp",
+        "FontCollectionItemizeTest.cpp",
+        "FontFamilyTest.cpp",
+        "FontLanguageListCacheTest.cpp",
+        "FontTestUtils.cpp",
+        "HbFontCacheTest.cpp",
+        "MinikinFontForTest.cpp",
+        "MinikinInternalTest.cpp",
+        "GraphemeBreakTests.cpp",
+        "LayoutUtilsTest.cpp",
+        "UnicodeUtils.cpp",
+        "WordBreakerTests.cpp",
+    ],
+
+    header_libs: ["libminikin-headers-for-tests"],
+
+    cppflags: [
+        "-Werror",
+        "-Wall",
+        "-Wextra",
+    ],
+
+    multilib: {
+        lib32: {
+            cppflags: ["-DkTestFontDir=\"/data/nativetest/minikin_tests/data/\""],
+        },
+        lib64: {
+            cppflags: ["-DkTestFontDir=\"/data/nativetest64/minikin_tests/data/\""],
+        },
+    },
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 2f21532..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (C) 2015 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.
-
-# see how_to_run.txt for instructions on running these tests
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_TEST_DATA := \
-    data/BoldItalic.ttf \
-    data/Bold.ttf \
-    data/ColorEmojiFont.ttf \
-    data/ColorTextMixedEmojiFont.ttf \
-    data/Emoji.ttf \
-    data/Italic.ttf \
-    data/Ja.ttf \
-    data/Ko.ttf \
-    data/NoGlyphFont.ttf \
-    data/Regular.ttf \
-    data/TextEmojiFont.ttf \
-    data/VarioationSelectorTest-Regular.ttf \
-    data/ZhHans.ttf \
-    data/ZhHant.ttf \
-    data/itemize.xml \
-    data/emoji.xml
-
-LOCAL_MODULE := minikin_tests
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE_CLASS := NATIVE_TESTS
-
-LOCAL_STATIC_LIBRARIES := libminikin
-
-# Shared libraries which are dependencies of minikin; these are not automatically
-# pulled in by the build system (and thus sadly must be repeated).
-
-LOCAL_SHARED_LIBRARIES := \
-    libskia \
-    libft2 \
-    libharfbuzz_ng \
-    libicuuc \
-    liblog \
-    libutils \
-    libz
-
-LOCAL_STATIC_LIBRARIES += \
-    libxml2
-
-LOCAL_SRC_FILES += \
-    FontCollectionTest.cpp \
-    FontCollectionItemizeTest.cpp \
-    FontFamilyTest.cpp \
-    FontLanguageListCacheTest.cpp \
-    FontTestUtils.cpp \
-    HbFontCacheTest.cpp \
-    MinikinFontForTest.cpp \
-    MinikinInternalTest.cpp \
-    GraphemeBreakTests.cpp \
-    LayoutUtilsTest.cpp \
-    UnicodeUtils.cpp \
-    WordBreakerTests.cpp
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../libs/minikin/ \
-    external/harfbuzz_ng/src \
-    external/libxml2/include \
-    external/skia/src/core
-
-LOCAL_CPPFLAGS += -Werror -Wall -Wextra
-
-LOCAL_CPPFLAGS_32 += -DkTestFontDir="\"/data/nativetest/minikin_tests/data/\""
-LOCAL_CPPFLAGS_64 += -DkTestFontDir="\"/data/nativetest64/minikin_tests/data/\""
-
-include $(BUILD_NATIVE_TEST)