diff --git a/.drone.yml b/.drone.yml
index 8ca0e8a0bbfb723243ff337637bf59ccb8afafaf..628cb7170ef5e8eb3a78149a6be1e96dbc9c1efc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -89,6 +89,14 @@ pipeline:
     when:
       matrix:
         TESTS: syntax-php7.2
+  syntax-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - composer install
+      - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
+    when:
+      matrix:
+        TESTS: syntax-php7.3
   phan:
     image: nextcloudci/php7.2:php7.2-12
     commands:
@@ -214,6 +222,14 @@ pipeline:
       matrix:
         DB: NODB
         PHP: 7.2
+  nodb-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: 7.3
   sqlite-php7.0:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -238,6 +254,14 @@ pipeline:
       matrix:
         DB: sqlite
         PHP: 7.2
+  sqlite-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: sqlite
+        PHP: 7.3
   mysql-php7.0:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -262,6 +286,14 @@ pipeline:
       matrix:
         DB: mysql
         PHP: 7.2
+  mysql-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql
+        PHP: 7.3
   mysql5.6-php7.0:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -336,6 +368,14 @@ pipeline:
       matrix:
         DB: mysqlmb4
         PHP: 7.2
+  mysqlmb4-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+    when:
+      matrix:
+        DB: mysqlmb4
+        PHP: 7.3
   integration-capabilities_features:
     image: nextcloudci/integration-php7.0:integration-php7.0-8
     commands:
@@ -804,6 +844,9 @@ matrix:
     - DB: NODB
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: NODB
+      PHP: 7.3
+      ENABLE_REDIS: false
     - DB: sqlite
       PHP: 7.0
       ENABLE_REDIS: true
@@ -813,6 +856,9 @@ matrix:
     - DB: sqlite
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: sqlite
+      PHP: 7.3
+      ENABLE_REDIS: false
     - DB: mysql
       PHP: 7.0
       ENABLE_REDIS: true
@@ -822,6 +868,9 @@ matrix:
     - DB: mysql
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: mysql
+      PHP: 7.3
+      ENABLE_REDIS: false
     - DB: mysql5.6
       PHP: 7.0
       ENABLE_REDIS: true
@@ -855,6 +904,9 @@ matrix:
     - DB: mysqlmb4
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: mysqlmb4
+      PHP: 7.3
+      ENABLE_REDIS: false
     - TESTS: integration-capabilities_features
     - TESTS: integration-federation_features
     - TESTS: integration-maintenance-mode
@@ -912,6 +964,7 @@ matrix:
     - TESTS: syntax-php7.0
     - TESTS: syntax-php7.1
     - TESTS: syntax-php7.2
+    - TESTS: syntax-php7.3
     - TESTS: phan
     - TESTS: litmus-v1
     - TESTS: litmus-v2
diff --git a/lib/versioncheck.php b/lib/versioncheck.php
index 48e16471967e3af3563139f76b9a00264a84362e..739c045f6df3f55c489160cda14b5ee4100209cc 100644
--- a/lib/versioncheck.php
+++ b/lib/versioncheck.php
@@ -9,10 +9,10 @@ if (version_compare(PHP_VERSION, '7.0') === -1) {
 	exit(-1);
 }
 
-// Show warning if > PHP 7.2 is used as Nextcloud is not compatible with > PHP 7.2 for now
-if (version_compare(PHP_VERSION, '7.3.0') !== -1) {
+// Show warning if > PHP 7.3 is used as Nextcloud is not compatible with > PHP 7.3 for now
+if (version_compare(PHP_VERSION, '7.4.0') !== -1) {
 	http_response_code(500);
-	echo 'This version of Nextcloud is not compatible with > PHP 7.2.<br/>';
+	echo 'This version of Nextcloud is not compatible with > PHP 7.3.<br/>';
 	echo 'You are currently running ' . PHP_VERSION . '.';
 	exit(-1);
 }