diff --git a/.drone.yml b/.drone.yml
index 2080de5a123e9ab120ef442bdd70d0530913ae8e..90ac6e4e417ced0d28e94b279d8cf2b9e0569afa 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,18 +15,7 @@ pipeline:
   checkers:
     image: nextcloudci/php7.0:php7.0-7
     commands:
-      - bash ./build/autoloaderchecker.sh
-      - bash ./build/mergejschecker.sh
-      - php ./build/translation-checker.php
-      - php ./build/htaccess-checker.php
-      - ./occ app:check-code admin_audit
-      - ./occ app:check-code comments
-      - ./occ app:check-code federation
-      - ./occ app:check-code sharebymail
-      - ./occ app:check-code systemtags
-      - ./occ app:check-code theming
-      - ./occ app:check-code workflowengine
-      - php ./build/signed-off-checker.php
+      - ./autotest-checkers.sh
     when:
       matrix:
         TESTS: checkers
diff --git a/autotest-checkers.sh b/autotest-checkers.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ff89eba2b5e3a616ec9601feaf95881681846031
--- /dev/null
+++ b/autotest-checkers.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+#
+
+bash ./build/autoloaderchecker.sh
+bash ./build/mergejschecker.sh
+php ./build/translation-checker.php
+php ./build/htaccess-checker.php
+
+
+for app in $(find "apps/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do
+    if
+        [ "$app" == "dav" ] || \
+        [ "$app" == "encryption" ] || \
+        [ "$app" == "federatedfilesharing" ] || \
+        [ "$app" == "files" ] || \
+        [ "$app" == "files_external" ] || \
+        [ "$app" == "files_sharing" ] || \
+        [ "$app" == "files_trashbin" ] || \
+        [ "$app" == "files_versions" ] || \
+        [ "$app" == "lookup_server_connector" ] || \
+        [ "$app" == "provisioning_api" ] || \
+        [ "$app" == "testing" ] || \
+        [ "$app" == "twofactor_backupcodes" ] || \
+        [ "$app" == "updatenotification" ] || \
+        [ "$app" == "user_ldap" ]
+    then
+        ./occ app:check-code -c strong-comparison "$app"
+    else
+        ./occ app:check-code "$app"
+    fi
+    RESULT=$?
+done;
+
+php ./build/signed-off-checker.php