diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 7dc8155..1ebe8fd 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -330,8 +330,13 @@
     }
 
     public void startEditingFolderName() {
-        mFolderName.setHint("");
-        mIsEditingName = true;
+        post(new Runnable() {
+            @Override
+            public void run() {
+                mFolderName.setHint("");
+                mIsEditingName = true;
+            }
+        });
     }
 
     public void dismissEditingName() {
diff --git a/tests/src/com/android/launcher3/BindWidgetTest.java b/tests/src/com/android/launcher3/BindWidgetTest.java
index 4e8881c..34b1174 100644
--- a/tests/src/com/android/launcher3/BindWidgetTest.java
+++ b/tests/src/com/android/launcher3/BindWidgetTest.java
@@ -19,6 +19,7 @@
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiSelector;
 import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
 
 import com.android.launcher3.compat.AppWidgetManagerCompat;
 import com.android.launcher3.compat.PackageInstallerCompat;
@@ -38,6 +39,7 @@
  *
  * Note running these tests will clear the workspace on the device.
  */
+@LargeTest
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class BindWidgetTest extends InstrumentationTestCase {
 
diff --git a/tests/src/com/android/launcher3/QuickAddWidgetTest.java b/tests/src/com/android/launcher3/QuickAddWidgetTest.java
index 027c465..0078294 100644
--- a/tests/src/com/android/launcher3/QuickAddWidgetTest.java
+++ b/tests/src/com/android/launcher3/QuickAddWidgetTest.java
@@ -9,6 +9,7 @@
 import android.support.test.uiautomator.UiObject2;
 import android.support.test.uiautomator.Until;
 import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
@@ -17,6 +18,7 @@
 /**
  * Add an arbitrary widget from the widget picker very quickly to test potential race conditions.
  */
+@LargeTest
 public class QuickAddWidgetTest extends InstrumentationTestCase {
     // Disabled because it's flaky and not particularly useful. But this class could still be useful
     // as an example if we want other UI tests in the future.
diff --git a/tests/src/com/android/launcher3/RotationPreferenceTest.java b/tests/src/com/android/launcher3/RotationPreferenceTest.java
index 0168ee6..7259d35 100644
--- a/tests/src/com/android/launcher3/RotationPreferenceTest.java
+++ b/tests/src/com/android/launcher3/RotationPreferenceTest.java
@@ -8,10 +8,12 @@
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
 import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
 
 /**
  * Test for auto rotate preference.
  */
+@MediumTest
 public class RotationPreferenceTest extends InstrumentationTestCase {
 
     private UiDevice mDevice;
diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
index 46dac0a..ccd8f73 100644
--- a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
+++ b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java
@@ -5,6 +5,7 @@
 import android.database.Cursor;
 import android.graphics.Point;
 import android.test.ProviderTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
 
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherModel;
@@ -19,6 +20,7 @@
 /**
  * Unit tests for {@link GridSizeMigrationTask}
  */
+@MediumTest
 public class GridSizeMigrationTaskTest extends ProviderTestCase2<TestLauncherProvider> {
 
     private static final long DESKTOP = LauncherSettings.Favorites.CONTAINER_DESKTOP;