diff --git a/.drone.yml b/.drone.yml
index 93473bd..bdc359c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,7 +5,7 @@ clone:
 
 pipeline:
   check-app-compatbility:
-    image: nextcloudci/php5.6:php5.6-3
+    image: nextcloudci/php7.0:php7.0-2
     environment:
       - APP_NAME=user_saml
       - CORE_BRANCH=master
@@ -23,6 +23,25 @@ pipeline:
     when:
       matrix:
         TESTS: check-app-compatbility
+  check-app-compatbility-stable13:
+    image: nextcloudci/php5.6:php5.6-3
+    environment:
+      - APP_NAME=user_saml
+      - CORE_BRANCH=stable13
+      - DB=sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server
+
+      # Code checker
+      - ./occ app:check-code $APP_NAME -c strong-comparison
+      - ./occ app:check-code $APP_NAME -c deprecation
+      - cd apps/$APP_NAME/
+    when:
+      matrix:
+        TESTS: check-app-compatbility-stable13
   check-app-compatbility-stable12:
     image: nextcloudci/php5.6:php5.6-3
     environment:
@@ -57,31 +76,6 @@ pipeline:
     when:
       matrix:
         TESTS: signed-off-check
-  php5.6:
-    image: nextcloudci/php5.6:php5.6-3
-    environment:
-      - APP_NAME=user_saml
-      - CORE_BRANCH=master
-      - DB=sqlite
-    commands:
-      - apt update && apt-get -y install php5-xdebug
-
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/apps/$APP_NAME
-
-      # Run phpunit tests
-      - cd tests/unit/
-      - phpunit --configuration phpunit.xml
-
-      # Create coverage report
-      - wget https://codecov.io/bash -O codecov.sh
-      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t f3e5390a-15fe-46ea-9e10-8b24addb0d40 -f clover.xml; fi"
-      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t f3e5390a-15fe-46ea-9e10-8b24addb0d40 -f clover.xml; fi"
-    when:
-      matrix:
-        TESTS: php5.6
   php7.0:
     image: nextcloudci/php7.0:php7.0-2
     environment:
@@ -118,6 +112,67 @@ pipeline:
     when:
       matrix:
         TESTS: php7.1
+  php5.6-stable13:
+    image: nextcloudci/php5.6:php5.6-3
+    environment:
+      - APP_NAME=user_saml
+      - CORE_BRANCH=stable13
+      - DB=sqlite
+    commands:
+      - apt update && apt-get -y install php5-xdebug
+
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/apps/$APP_NAME
+
+      # Run phpunit tests
+      - cd tests/unit/
+      - phpunit --configuration phpunit.xml
+
+      # Create coverage report
+      - wget https://codecov.io/bash -O codecov.sh
+      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t f3e5390a-15fe-46ea-9e10-8b24addb0d40 -f clover.xml; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t f3e5390a-15fe-46ea-9e10-8b24addb0d40 -f clover.xml; fi"
+    when:
+      matrix:
+        TESTS: php5.6-stable13
+  php7.0-stable13:
+    image: nextcloudci/php7.0:php7.0-2
+    environment:
+      - APP_NAME=user_saml
+      - CORE_BRANCH=stable13
+      - DB=sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/apps/$APP_NAME
+
+      # Run phpunit tests
+      - cd tests/unit/
+      - phpunit --configuration phpunit.xml
+    when:
+      matrix:
+        TESTS: php7.0-stable13
+  php7.1-stable13:
+    image: nextcloudci/php7.1:php7.1-12
+    environment:
+      - APP_NAME=user_saml
+      - CORE_BRANCH=stable13
+      - DB=sqlite
+    commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server/apps/$APP_NAME
+
+      # Run phpunit tests
+      - cd tests/unit/
+      - phpunit --configuration phpunit.xml
+    when:
+      matrix:
+        TESTS: php7.1-stable13
   php5.6-stable12:
     image: nextcloudci/php5.6:php5.6-3
     environment:
@@ -199,6 +254,26 @@ pipeline:
     when:
       matrix:
         TESTS: integration-tests
+  integration-tests-stable13:
+    image: nextcloudci/user_saml_shibboleth:user_saml_shibboleth-5
+    environment:
+      - CORE_BRANCH=stable13
+    commands:
+      - /start.sh &
+      - sleep 3
+      - scl enable rh-php56 bash
+      - rm -rf /var/www/html
+      - cd /var/www/
+      - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
+      - cd /var/www/html && git submodule update --init
+      - cd /var/www/html/apps/ && git clone -b $DRONE_BRANCH https://github.com/nextcloud/user_saml.git
+      - php /var/www/html/occ maintenance:install --database sqlite --admin-pass password
+      - php /var/www/html/occ app:enable user_saml
+      - chown -R apache:apache /var/www/html/
+      - cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat
+    when:
+      matrix:
+        TESTS: integration-tests-stable13
   integration-tests-stable12:
     image: nextcloudci/user_saml_shibboleth:user_saml_shibboleth-5
     environment:
@@ -242,15 +317,19 @@ pipeline:
 
 matrix:
   include:
-    - TESTS: php5.6
     - TESTS: php7.0
     - TESTS: php7.1
+    - TESTS: php5.6-stable13
+    - TESTS: php7.0-stable13
+    - TESTS: php7.1-stable13
     - TESTS: php5.6-stable12
     - TESTS: php7.0-stable12
     - TESTS: php7.1-stable12
     - TESTS: check-app-compatbility
+    - TESTS: check-app-compatbility-stable13
     - TESTS: check-app-compatbility-stable12
     - TESTS: signed-off-check
     - TESTS: integration-tests
+    - TESTS: integration-tests-stable13
     - TESTS: integration-tests-stable12
     - TESTS: integration-tests-older-stable12