diff --git a/lib/tests/src/android/support/design/widget/AppBarWithCollapsingToolbarTest.java b/lib/tests/src/android/support/design/widget/AppBarWithCollapsingToolbarTest.java
index 1a796e318..84e1abedf 100644
--- a/lib/tests/src/android/support/design/widget/AppBarWithCollapsingToolbarTest.java
+++ b/lib/tests/src/android/support/design/widget/AppBarWithCollapsingToolbarTest.java
@@ -21,13 +21,13 @@ import static org.junit.Assert.assertEquals;
 import android.os.Build;
 import android.os.SystemClock;
 import android.support.design.test.R;
-import android.support.test.filters.MediumTest;
+import android.support.test.filters.LargeTest;
 import android.support.test.filters.SdkSuppress;
 import android.widget.ImageView;
 
 import org.junit.Test;
 
-@MediumTest
+@LargeTest
 public class AppBarWithCollapsingToolbarTest extends AppBarLayoutBaseTest {
     @Test
     public void testPinnedToolbar() throws Throwable {
diff --git a/lib/tests/src/android/support/design/widget/AppBarWithToolbarAndTabsTest.java b/lib/tests/src/android/support/design/widget/AppBarWithToolbarAndTabsTest.java
index 760445748..c745f17fa 100644
--- a/lib/tests/src/android/support/design/widget/AppBarWithToolbarAndTabsTest.java
+++ b/lib/tests/src/android/support/design/widget/AppBarWithToolbarAndTabsTest.java
@@ -28,11 +28,10 @@ import android.support.annotation.StringRes;
 import android.support.design.test.R;
 import android.support.design.testutils.Cheeses;
 import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
 
 import org.junit.Test;
 
-@MediumTest
+@LargeTest
 public class AppBarWithToolbarAndTabsTest extends AppBarLayoutBaseTest {
     private TabLayout mTabLayout;
 
diff --git a/lib/tests/src/android/support/design/widget/NavigationViewTest.java b/lib/tests/src/android/support/design/widget/NavigationViewTest.java
index 132715475..70312818b 100755
--- a/lib/tests/src/android/support/design/widget/NavigationViewTest.java
+++ b/lib/tests/src/android/support/design/widget/NavigationViewTest.java
@@ -65,7 +65,7 @@ import android.support.annotation.ColorInt;
 import android.support.annotation.IdRes;
 import android.support.design.test.R;
 import android.support.design.testutils.TestDrawable;
-import android.support.test.filters.SmallTest;
+import android.support.test.filters.MediumTest;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -85,6 +85,7 @@ import org.junit.Test;
 import java.util.HashMap;
 import java.util.Map;
 
+@MediumTest
 public class NavigationViewTest
         extends BaseInstrumentationTestCase<NavigationViewActivity> {
     private static final int[] MENU_CONTENT_ITEM_IDS = { R.id.destination_home,
@@ -118,7 +119,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testBasics() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -141,7 +141,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testWillNotDraw() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -154,7 +153,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testTextAppearance() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -182,7 +180,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testTextColor() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -213,7 +210,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testBackground() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -271,7 +267,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testIconTinting() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -366,7 +361,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testHeaders() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -404,7 +398,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testHeaderState() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -443,7 +436,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testNavigationSelectionListener() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -511,7 +503,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testCheckedAppearance() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
@@ -582,7 +573,6 @@ public class NavigationViewTest
     }
 
     @Test
-    @SmallTest
     public void testActionLayout() {
         // Open our drawer
         onView(withId(R.id.drawer_layout)).perform(openDrawer(GravityCompat.START));
diff --git a/lib/tests/src/android/support/design/widget/SnackbarTest.java b/lib/tests/src/android/support/design/widget/SnackbarTest.java
index 1cd2960d6..5fd06580f 100644
--- a/lib/tests/src/android/support/design/widget/SnackbarTest.java
+++ b/lib/tests/src/android/support/design/widget/SnackbarTest.java
@@ -46,7 +46,6 @@ import android.support.design.testutils.SnackbarUtils;
 import android.support.test.espresso.ViewAction;
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
 import android.support.v4.view.ViewCompat;
 import android.text.TextUtils;
 import android.view.View;
@@ -54,6 +53,7 @@ import android.view.View;
 import org.junit.Before;
 import org.junit.Test;
 
+@MediumTest
 public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity> {
     private static final String MESSAGE_TEXT = "Test Message";
     private static final @StringRes int MESSAGE_ID = R.string.snackbar_text;
@@ -98,7 +98,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @SmallTest
     public void testBasicContent() throws Throwable {
         // Verify different combinations of snackbar content (message and action) and duration
 
@@ -181,7 +180,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testDismissViaActionClick() throws Throwable {
         verifyDismissCallback(
                 onView(withId(R.id.snackbar_action)),
@@ -192,7 +190,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testDismissViaSwipe() throws Throwable {
         verifyDismissCallback(
                 onView(isAssignableFrom(Snackbar.SnackbarLayout.class)),
@@ -203,7 +200,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testDismissViaSwipeRtl() throws Throwable {
         onView(withId(R.id.col)).perform(setLayoutDirection(ViewCompat.LAYOUT_DIRECTION_RTL));
         if (ViewCompat.getLayoutDirection(mCoordinatorLayout) == ViewCompat.LAYOUT_DIRECTION_RTL) {
@@ -219,7 +215,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testDismissViaApi() throws Throwable {
         verifyDismissCallback(
                 onView(isAssignableFrom(Snackbar.SnackbarLayout.class)),
@@ -235,7 +230,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testDismissViaTimeout() throws Throwable {
         verifyDismissCallback(
                 onView(isAssignableFrom(Snackbar.SnackbarLayout.class)),
@@ -246,7 +240,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testDismissViaAnotherSnackbar() throws Throwable {
         final Snackbar anotherSnackbar =
                 Snackbar.make(mCoordinatorLayout, "A different message", Snackbar.LENGTH_SHORT);
@@ -270,7 +263,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testActionClickListener() {
         final View.OnClickListener mockClickListener = mock(View.OnClickListener.class);
         final Snackbar snackbar =
@@ -286,7 +278,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testSetCallback() throws Throwable {
         final Snackbar snackbar =
                 Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)
@@ -304,7 +295,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testSingleCallback() throws Throwable {
         final Snackbar snackbar =
                 Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)
@@ -327,7 +317,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testMultipleCallbacks() throws Throwable {
         final Snackbar snackbar =
                 Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)
@@ -351,7 +340,6 @@ public class SnackbarTest extends BaseInstrumentationTestCase<SnackbarActivity>
     }
 
     @Test
-    @MediumTest
     public void testMultipleCallbacksWithRemoval() throws Throwable {
         final Snackbar snackbar =
                 Snackbar.make(mCoordinatorLayout, MESSAGE_TEXT, Snackbar.LENGTH_INDEFINITE)
diff --git a/lib/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java b/lib/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java
index 2e75fb787..00810d529 100755
--- a/lib/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java
+++ b/lib/tests/src/android/support/design/widget/TabLayoutWithViewPagerTest.java
@@ -42,6 +42,7 @@ import android.support.design.testutils.TabLayoutActions;
 import android.support.design.testutils.TestUtilsActions;
 import android.support.design.testutils.TestUtilsMatchers;
 import android.support.design.testutils.ViewPagerActions;
+import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
 import android.support.v4.view.PagerAdapter;
@@ -534,19 +535,19 @@ public class TabLayoutWithViewPagerTest
     }
 
     @Test
-    @MediumTest
+    @LargeTest
     public void testMinTabWidth() {
         verifyMinMaxTabWidth(R.layout.tab_layout_bound_min, R.dimen.tab_width_limit_medium, 0);
     }
 
     @Test
-    @MediumTest
+    @LargeTest
     public void testMaxTabWidth() {
         verifyMinMaxTabWidth(R.layout.tab_layout_bound_max, 0, R.dimen.tab_width_limit_medium);
     }
 
     @Test
-    @MediumTest
+    @LargeTest
     public void testMinMaxTabWidth() {
         verifyMinMaxTabWidth(R.layout.tab_layout_bound_minmax, R.dimen.tab_width_limit_small,
                 R.dimen.tab_width_limit_large);