diff --git a/tests/javatests/android/support/design/widget/TextInputLayoutPseudoLocaleTest.java b/tests/javatests/android/support/design/widget/TextInputLayoutPseudoLocaleTest.java
index 14db2391d..861b3eaf5 100644
--- a/tests/javatests/android/support/design/widget/TextInputLayoutPseudoLocaleTest.java
+++ b/tests/javatests/android/support/design/widget/TextInputLayoutPseudoLocaleTest.java
@@ -26,8 +26,8 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.support.design.testapp.R;
 import android.support.design.testapp.TextInputLayoutActivity;
+import android.support.test.filters.MediumTest;
 import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import java.util.Locale;
@@ -37,7 +37,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-@SmallTest
+@MediumTest
 @SdkSuppress(minSdkVersion = 17) // Needed for Configuration#setLocale
 @RunWith(AndroidJUnit4.class)
 public class TextInputLayoutPseudoLocaleTest {
diff --git a/tests/javatests/android/support/design/widget/TextInputLayoutTest.java b/tests/javatests/android/support/design/widget/TextInputLayoutTest.java
index cea4639c1..99dd1ebfa 100644
--- a/tests/javatests/android/support/design/widget/TextInputLayoutTest.java
+++ b/tests/javatests/android/support/design/widget/TextInputLayoutTest.java
@@ -60,7 +60,7 @@ import android.support.design.testapp.R;
 import android.support.design.testapp.TextInputLayoutActivity;
 import android.support.design.testutils.TestUtils;
 import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
+import android.support.test.filters.MediumTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v4.widget.TextViewCompat;
@@ -76,7 +76,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-@SmallTest
+@MediumTest
 @RunWith(AndroidJUnit4.class)
 public class TextInputLayoutTest {
   @Rule