diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0dcdfd9bf..423974155 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,7 +93,8 @@ errorprone:
     - wait-for-emulator
     - adb devices
     - adb shell input keyevent 82 &
-    - ./gradlew connectedFullDebugAndroidTest || (adb -e logcat -d > logcat.txt; exit 1)
+    - test $AVD_SDK -ge 25 || export FLAG=-Pandroid.testInstrumentationRunnerArguments.notAnnotation=android.test.suitebuilder.annotation.LargeTest
+    - ./gradlew connectedFullDebugAndroidTest $FLAG || (adb -e logcat -d > logcat.txt; exit 1)
 
 connected 24 default armeabi-v7a:
   retry: 1
diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
index 984e2869a..25d20d1af 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
@@ -48,7 +48,6 @@ import static org.junit.Assert.assertTrue;
 
 @Ignore
 @RunWith(AndroidJUnit4.class)
-@LargeTest
 public class MainActivityEspressoTest {
     public static final String TAG = "MainActivityEspressoTest";
 
@@ -151,7 +150,7 @@ public class MainActivityEspressoTest {
         }
     }
 
-    @Test
+    @LargeTest
     public void showSettings() {
         ViewInteraction settingsBottonNavButton = onView(
                 allOf(withText(R.string.menu_settings), isDisplayed()));
@@ -168,14 +167,14 @@ public class MainActivityEspressoTest {
         onView(withText(R.string.installed_apps__activity_title)).check(matches(isDisplayed()));
     }
 
-    @Test
+    @LargeTest
     public void showUpdates() {
         ViewInteraction updatesBottonNavButton = onView(allOf(withText(R.string.main_menu__updates), isDisplayed()));
         updatesBottonNavButton.perform(click());
         onView(withText(R.string.main_menu__updates)).check(matches(isDisplayed()));
     }
 
-    @Test
+    @LargeTest
     public void startSwap() {
         if (!BuildConfig.FLAVOR.startsWith("full")) {
             return;
@@ -189,7 +188,7 @@ public class MainActivityEspressoTest {
         onView(withText(R.string.swap_send_fdroid)).check(matches(isDisplayed()));
     }
 
-    @Test
+    @LargeTest
     public void showCategories() {
         if (!BuildConfig.FLAVOR.startsWith("full")) {
             return;
@@ -214,7 +213,7 @@ public class MainActivityEspressoTest {
                 .perform(click());
     }
 
-    @Test
+    @LargeTest
     public void showLatest() {
         if (!BuildConfig.FLAVOR.startsWith("full")) {
             return;
@@ -236,7 +235,7 @@ public class MainActivityEspressoTest {
                 .perform(click());
     }
 
-    @Test
+    @LargeTest
     public void showSearch() {
         onView(allOf(withText(R.string.menu_settings), isDisplayed())).perform(click());
         onView(withId(R.id.fab_search)).check(doesNotExist());