diff --git a/k9mail/src/androidTest/java/com/fsck/k9/endtoend/AbstractEndToEndTest.java b/k9mail/src/androidTest/java/com/fsck/k9/endtoend/AbstractEndToEndTest.java
index 5796596d6..0db1b97b5 100644
--- a/k9mail/src/androidTest/java/com/fsck/k9/endtoend/AbstractEndToEndTest.java
+++ b/k9mail/src/androidTest/java/com/fsck/k9/endtoend/AbstractEndToEndTest.java
@@ -32,12 +32,12 @@ public abstract class AbstractEndToEndTest<T extends Activity> extends ActivityI
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        state.stubMailServer = new StubMailServer();
         getActivity();
 
         if (bypassWelcome) {
             bypassWelcomeScreen();
         }
-        state.stubMailServer = new StubMailServer();
     }
 
     @Override