--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
@@ -417,27 +417,30 @@ abstract class BaseTest extends BaseRobo
             }
         }
     }
 
     public final void selectMenuItem(String menuItemName) {
         // build the item name ready to be used
         String itemName = "^" + menuItemName + "$";
         mActions.sendSpecialKey(Actions.SpecialKey.MENU);
+        waitForAnimationsToFinish();
         if (waitForText(itemName, true)) {
             mSolo.clickOnText(itemName);
         } else {
             // Older versions of Android have additional settings under "More",
             // including settings that newer versions have under "Tools."
             if (mSolo.searchText("(^More$|^Tools$)")) {
                 mSolo.clickOnText("(^More$|^Tools$)");
+                waitForAnimationsToFinish();
             }
             waitForText(itemName);
             mSolo.clickOnText(itemName);
         }
+        waitForAnimationsToFinish();
     }
 
     public final void verifyHomePagerHidden() {
         final View homePagerContainer = mSolo.getView(R.id.home_pager_container);
 
         boolean rc = waitForCondition(new Condition() {
             @Override
             public boolean isSatisfied() {

--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/PixelTest.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/PixelTest.java
@@ -46,16 +46,17 @@ abstract class PixelTest extends BaseTes
         return p;
     }
 
     protected final void reloadAndPaint() {
         PaintedSurface painted = reloadAndGetPainted();
         painted.close();
     }
 
+    // This should be merged with BaseTest.addTab, but it's probably not worth the time.
     public void addTab(String url, String title, boolean isPrivate) {
         Actions.EventExpecter tabEventExpecter = mActions.expectGeckoEvent("Tab:Added");
         Actions.EventExpecter contentEventExpecter = mActions.expectGeckoEvent("DOMContentLoaded");
 
         if (isPrivate) {
             selectMenuItem(mStringHelper.NEW_PRIVATE_TAB_LABEL);
         } else {
             selectMenuItem(mStringHelper.NEW_TAB_LABEL);