diff --git a/Android.bp b/Android.bp
index 252d173..5801445 100644
--- a/Android.bp
+++ b/Android.bp
@@ -199,6 +199,7 @@
 
 cc_test {
   name: "boringssl_crypto_test",
+  test_suites: ["device-tests"],
   host_supported: true,
   defaults: ["boringssl_crypto_test_sources", "boringssl_flags"],
   whole_static_libs: ["boringssl_test_support"],
@@ -209,6 +210,7 @@
 
 cc_test {
   name: "boringssl_ssl_test",
+  test_suites: ["device-tests"],
   host_supported: true,
   defaults: ["boringssl_ssl_test_sources", "boringssl_flags"],
   whole_static_libs: ["boringssl_test_support"],
diff --git a/AndroidTest.xml b/AndroidTest.xml
new file mode 100644
index 0000000..e9805b7
--- /dev/null
+++ b/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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="Config for BoringSSL device tests">
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="cleanup" value="true" />
+        <option name="push" value="boringssl_ssl_test->/data/local/tmp/boringssl_ssl_test" />
+        <option name="push" value="boringssl_crypto_test->/data/local/tmp/boringssl_crypto_test" />
+    </target_preparer>
+    <option name="test-suite-tag" value="apct" />
+    <test class="com.android.tradefed.testtype.GTest" >
+        <option name="native-test-device-path" value="/data/local/tmp/boringssl_ssl_test" />
+        <option name="module-name" value="boringssl_ssl_test" />
+    </test>
+    <test class="com.android.tradefed.testtype.GTest" >
+        <option name="native-test-device-path" value="/data/local/tmp/boringssl_crypto_test" />
+        <option name="module-name" value="boringssl_crypto_test" />
+    </test>
+</configuration>