diff --git a/libcutils/tests/Android.bp b/libcutils/tests/Android.bp
index c663a5d..a0b1d7b 100644
--- a/libcutils/tests/Android.bp
+++ b/libcutils/tests/Android.bp
@@ -62,6 +62,7 @@
 
 cc_test {
     name: "libcutils_test",
+    test_suites: ["device-tests"],
     defaults: ["libcutils_test_default"],
     host_supported: true,
     shared_libs: test_libraries,
diff --git a/libcutils/tests/AndroidTest.xml b/libcutils/tests/AndroidTest.xml
index c945f4d..dd7aca2 100644
--- a/libcutils/tests/AndroidTest.xml
+++ b/libcutils/tests/AndroidTest.xml
@@ -13,14 +13,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for libcutils_test_static">
+<configuration description="Config for libcutils_test">
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
-        <option name="push" value="libcutils_test_static->/data/local/tmp/libcutils_test_static" />
+        <option name="push" value="libcutils_test->/data/local/tmp/libcutils_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" />
-        <option name="module-name" value="libcutils_test_static" />
+        <option name="module-name" value="libcutils_test" />
     </test>
 </configuration>
\ No newline at end of file