diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..d690c4e
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,5 @@
+{
+    "postsubmit": [
+        { "name": "AvcEncTest" }
+    ]
+}
diff --git a/tests/Android.bp b/tests/Android.bp
index 656d3b7..89bb1e7 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -26,16 +26,17 @@ package {
 cc_test {
     name: "AvcEncTest",
     gtest: true,
+    test_suites: ["device-tests"],
 
-    srcs : [ "AvcEncTest.cpp" ],
+    srcs: ["AvcEncTest.cpp"],
 
     shared_libs: [
         "libutils",
-        "liblog"
+        "liblog",
     ],
 
     static_libs: [
-        "libavcenc"
+        "libavcenc",
     ],
 
     cflags: [