diff --git a/Drop-In/src/androidTest/java/com/braintreepayments/api/CreatePaymentMethodNonceTest.java b/Drop-In/src/androidTest/java/com/braintreepayments/api/CreatePaymentMethodNonceTest.java
index e1e3664f6a..2ac8bb3ab6 100644
--- a/Drop-In/src/androidTest/java/com/braintreepayments/api/CreatePaymentMethodNonceTest.java
+++ b/Drop-In/src/androidTest/java/com/braintreepayments/api/CreatePaymentMethodNonceTest.java
@@ -213,7 +213,6 @@ public void paypalButtonIsNotShownIfPayPalIsNotSupported() {
     }
 
     @Test(timeout = 30000)
-    @FlakyTest(tolerance = 3)
     public void backButtonExitsTheActivityIfThereAreNoPaymentMethodNoncesToSelectFrom() {
         Activity activity = getActivity(new TestClientTokenBuilder().build());
         waitForAddPaymentFormHeader();
@@ -221,6 +220,7 @@ public void backButtonExitsTheActivityIfThereAreNoPaymentMethodNoncesToSelectFro
         assertFalse(activity.isFinishing());
 
         getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+        getInstrumentation().waitForIdleSync();
 
         assertTrue(activity.isFinishing());
     }