diff --git a/.drone.yml b/.drone.yml
index 5634c496a6c5ad7a9c6ac6ee67cc19c787ff59af..20f6575f37f90a67dcfe96782628ae50d5730aa8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -130,6 +130,19 @@ pipeline:
       when:
         matrix:
           TESTS: sqlite-php7.0-samba-non-native
+  sqlite-php7.0-webdav-apache:
+    image: nextcloudci/webdav-apache-php7.0
+    commands:
+      - apache2
+      - ./autotest-external.sh sqlite webdav-apachedrone
+      - 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 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-webdav-apachedrone.xml; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-webdav-apachedrone.xml; fi"
+    when:
+      matrix:
+        TESTS: sqlite-php7.0-webdav-apache
   nodb-php5.6:
     image: nextcloudci/php5.6:php5.6-7
     commands:
@@ -452,6 +465,7 @@ matrix:
     - TESTS: sqlite-php7.0-samba-native
     - TESTS: sqlite-php7.0-samba-non-native
     - TEST: memcache-memcached
+    - TESTS: sqlite-php7.0-webdav-apache
     - DB: NODB
       PHP: 5.6
     - DB: NODB
diff --git a/apps/files_external/tests/env/start-webdav-apachedrone.sh b/apps/files_external/tests/env/start-webdav-apachedrone.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9887cea5eeedeb73c8017e479838d76790767851
--- /dev/null
+++ b/apps/files_external/tests/env/start-webdav-apachedrone.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Nextcloud
+#
+
+# retrieve current folder to place the config in the parent folder
+thisFolder=`echo $0 | sed 's#env/start-webdav-apachedrone\.sh##'`
+
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
+cat > $thisFolder/config.webdav.php <<DELIM
+<?php
+
+return array(
+    'run'=>true,
+    'host'=>'127.0.0.1:80/webdav/',
+    'user'=>'test',
+    'password'=>'pass',
+    'root'=>'',
+    'wait'=> 0
+);
+
+DELIM
+
diff --git a/apps/files_external/tests/env/stop-webdav-apachedrone.sh b/apps/files_external/tests/env/stop-webdav-apachedrone.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3c4b0492dd0cd4200f4d26cbaca4e283a3043cca
--- /dev/null
+++ b/apps/files_external/tests/env/stop-webdav-apachedrone.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+#
+# Nextcloud
+
+# retrieve current folder to remove the config from the parent folder
+thisFolder=`echo $0 | sed 's#env/stop-webdav-apachedrone\.sh##'`
+
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
+# cleanup
+rm $thisFolder/config.webdav.php
+