diff --git a/tests/Android.bp b/tests/Android.bp
index b85aa16..e272347 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -59,3 +59,7 @@
         "-Werror",
     ],
 }
+
+vts_config {
+    name: "VtsFmqUnitTests",
+}
diff --git a/tests/Android.mk b/tests/Android.mk
index 6efe7c2..822a571 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -32,8 +32,3 @@
 endif
 
 include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsFmqUnitTests
--include test/vts/tools/build/Android.host_config.mk