diff --git a/tests/src/com/android/email/RefreshManagerTest.java b/tests/src/com/android/email/RefreshManagerTest.java
index 845a3148d..123ad973a 100644
--- a/tests/src/com/android/email/RefreshManagerTest.java
+++ b/tests/src/com/android/email/RefreshManagerTest.java
@@ -509,6 +509,9 @@ public class RefreshManagerTest extends InstrumentationTestCase {
         public void addResultCallback(Result listener) {
             Assert.assertTrue(mListener == null);
             mListener = listener;
+
+            // Let it call listener.setRegistered(). Otherwise callbacks won't fire.
+            super.addResultCallback(listener);
         }
     }
 
diff --git a/tests/src/com/android/email/activity/ContactStatusLoaderTest.java b/tests/src/com/android/email/activity/ContactStatusLoaderTest.java
index 9661d1bae..bef10acc8 100644
--- a/tests/src/com/android/email/activity/ContactStatusLoaderTest.java
+++ b/tests/src/com/android/email/activity/ContactStatusLoaderTest.java
@@ -113,7 +113,7 @@ public class ContactStatusLoaderTest
         assertTrue(mProvider.mUris.size() >= 2);
         assertEquals("content://com.android.contacts/data/emails/lookup/a%40b.c",
                 mProvider.mUris.get(0));
-        assertEquals("content://com.android.contacts/data/12345",
+        assertEquals("content://com.android.contacts/data/12345?limit=1",
                 mProvider.mUris.get(1));
 
         // Check result
diff --git a/tests/src/com/android/email/activity/MessageOrderManagerTest.java b/tests/src/com/android/email/activity/MessageOrderManagerTest.java
index b36a55b85..2969c97f9 100644
--- a/tests/src/com/android/email/activity/MessageOrderManagerTest.java
+++ b/tests/src/com/android/email/activity/MessageOrderManagerTest.java
@@ -74,7 +74,7 @@ public class MessageOrderManagerTest extends ProviderTestCase2<EmailProvider> {
 
     public void testSelection() {
         MessageOrderManagerForTest mom = new MessageOrderManagerForTest(getContext(), 5, mCallback);
-        assertEquals("flagLoaded IN (2,1) AND mailboxKey=5", mom.getQuerySelection());
+        assertEquals("mailboxKey=5 AND (flagLoaded IN (2,1))", mom.getQuerySelection());
     }
 
     /**