diff --git a/.drone.yml b/.drone.yml
index 2299a4e1b5..55a81ff0e4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -345,12 +345,14 @@ steps:
     environment:
       APP_NAME: spreed
       CORE_BRANCH: master
+      GUESTS_BRANCH: master
       DATABASEHOST: mysql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
       - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
       - cd ../server
+      - git clone --depth 1 -b "$GUESTS_BRANCH" https://github.com/nextcloud/guests apps/guests
       - ./occ app:enable $APP_NAME
       - cd apps/$APP_NAME
 
@@ -567,12 +569,14 @@ steps:
     environment:
       APP_NAME: spreed
       CORE_BRANCH: master
+      GUESTS_BRANCH: master
       DATABASEHOST: pgsql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
       - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
       - cd ../server
+      - git clone --depth 1 -b "$GUESTS_BRANCH" https://github.com/nextcloud/guests apps/guests
       - ./occ app:enable $APP_NAME
       - cd apps/$APP_NAME
 
diff --git a/tests/drone-run-acceptance-tests.sh b/tests/drone-run-acceptance-tests.sh
index df5ac683b4..beec7f6efc 100755
--- a/tests/drone-run-acceptance-tests.sh
+++ b/tests/drone-run-acceptance-tests.sh
@@ -8,7 +8,9 @@ echo "========================="
 
 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | wc -l) -eq 0 ]] && echo "No files are modified => merge commit" && exit 0
 
-[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep "appinfo/info.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0
+[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "\.drone\.yml") -gt 0 ]] && echo ".drone.yml is modified" && exit 0
+
+[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "appinfo/info\.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0
 
 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep --invert-match "^tests/" | grep -c ".php$") -gt 0 ]] && echo "PHP files are modified" && exit 0
 
diff --git a/tests/drone-run-integration-tests.sh b/tests/drone-run-integration-tests.sh
index 3b9dffd113..d92737e97f 100755
--- a/tests/drone-run-integration-tests.sh
+++ b/tests/drone-run-integration-tests.sh
@@ -8,7 +8,9 @@ echo "========================="
 
 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | wc -l) -eq 0 ]] && echo "No files are modified => merge commit" && exit 0
 
-[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep "appinfo/info.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0
+[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c '^\.drone\.yml$') -gt 0 ]] && echo ".drone.yml is modified" && exit 0
+
+[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "appinfo/info\.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0
 
 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep --invert-match "^tests/" | grep -c ".php$") -gt 0 ]] && echo "PHP files are modified" && exit 0
 
diff --git a/tests/drone-run-php-tests.sh b/tests/drone-run-php-tests.sh
index 4a60cc66f2..f6af87f2ac 100755
--- a/tests/drone-run-php-tests.sh
+++ b/tests/drone-run-php-tests.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 echo "========================="
 echo "= List of changed files ="
 echo "========================="
@@ -8,7 +7,9 @@ echo "========================="
 
 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | wc -l) -eq 0 ]] && echo "No files are modified => merge commit" && exit 0
 
-[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep "appinfo/info.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0
+[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c '^\.drone\.yml$') -gt 0 ]] && echo ".drone.yml is modified" && exit 0
+
+[[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep -c "appinfo/info\.xml") -gt 0 ]] && echo "info.xml is modified" && exit 0
 
 [[ $(git diff --name-only origin/$DRONE_TARGET_BRANCH...$DRONE_COMMIT_SHA | grep --invert-match "^tests/" | grep -c ".php$") -gt 0 ]] && echo "PHP files are modified" && exit 0