diff --git a/.cirrus.yml b/.cirrus.yml
index 6115b7785..425375159 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -51,8 +51,8 @@ instrumentation_tests_task:
     adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport;
     adb reboot;
     adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;';
-  run_large_tests_script: ./gradlew -Pinstrumented_test_size=large :app:connectedAndroidTest
-  run_medium_tests_script: ./gradlew -Pinstrumented_test_size=medium :app:connectedAndroidTest
+  run_large_tests_script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.size=large :app:connectedAndroidTest
+  run_other_tests_script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest connectedAndroidTest
   always:
     pull_screenshots_script:
       adb pull /sdcard/seedvault_test_results
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6a577a106..c1bb3a493 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,13 +32,6 @@ android {
         versionNameSuffix = "-${gitDescribe()}"
         testInstrumentationRunner = "com.stevesoltys.seedvault.KoinInstrumentationTestRunner"
         testInstrumentationRunnerArguments["disableAnalytics"] = "true"
-
-        if (project.hasProperty("instrumented_test_size")) {
-            val testSize = project.property("instrumented_test_size").toString()
-            println("Instrumented test size: $testSize")
-
-            testInstrumentationRunnerArguments["size"] = testSize
-        }
     }
 
     signingConfigs {