diff --git a/tests/anomaly-tester/res/values/strings.xml b/tests/anomaly-tester/res/values/strings.xml
index 99de34e62dd..da5635698c6 100644
--- a/tests/anomaly-tester/res/values/strings.xml
+++ b/tests/anomaly-tester/res/values/strings.xml
@@ -15,5 +15,5 @@
 -->
 
 <resources>
-    <string name="app_name">AnomalyTester</string>
+    <string name="app_name" translatable="false">AnomalyTester</string>
 </resources>
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index ec0f0b6662c..58fe7dd1d21 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -10,13 +10,13 @@ LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common ims-common
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
     espresso-core \
-    legacy-android-test \
-    mockito-target-minus-junit4 \
-    truth-prebuilt \
-    ub-uiautomator \
     espresso-contrib-nodep \
     espresso-intents-nodep \
-
+    legacy-android-test \
+    mockito-target-minus-junit4 \
+    platform-test-annotations \
+    truth-prebuilt \
+    ub-uiautomator
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
index 322f328f410..c75ca132048 100644
--- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
+++ b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
@@ -19,6 +19,7 @@ package com.android.settings.core;
 import static junit.framework.Assert.fail;
 
 import android.content.Context;
+import android.platform.test.annotations.Presubmit;
 import android.provider.SearchIndexableResource;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
@@ -49,6 +50,7 @@ public class PreferenceControllerContractTest {
     }
 
     @Test
+    @Presubmit
     public void controllersInSearchShouldImplementPreferenceControllerMixin() {
         final Set<String> errorClasses = new ArraySet<>();
 
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
index 5be9a365e00..4c5177235c4 100644
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -21,6 +21,7 @@ import static junit.framework.Assert.fail;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
+import android.platform.test.annotations.Presubmit;
 import android.provider.SearchIndexableResource;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
@@ -83,6 +84,7 @@ public class UniquePreferenceTest {
      * should have a key.
      */
     @Test
+    @Presubmit
     public void allPreferencesShouldHaveUniqueKey()
             throws IOException, XmlPullParserException, Resources.NotFoundException {
         final Set<String> uniqueKeys = new HashSet<>();