diff --git a/.drone.yml b/.drone.yml
index 0d7fc4e35..a8b11bf78 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,7 +5,7 @@ steps:
   image: nextcloudci/php7.2:php7.2-13
   environment:
     APP_NAME: deck
-    CORE_BRANCH: master
+    CORE_BRANCH: stable17
     DB: sqlite
   commands:
     # Pre-setup steps
@@ -20,7 +20,7 @@ steps:
   image: nextcloudci/php7.2:php7.2-13
   environment:
     APP_NAME: deck
-    CORE_BRANCH: master
+    CORE_BRANCH: stable17
     DB: sqlite
   commands:
     - composer install
@@ -29,7 +29,7 @@ steps:
   image: nextcloudci/php7.3:php7.3-2
   environment:
     APP_NAME: deck
-    CORE_BRANCH: master
+    CORE_BRANCH: stable17
     DB: sqlite
   commands:
     - composer install
@@ -38,7 +38,7 @@ steps:
   image: nextcloudci/php7.4:2
   environment:
       APP_NAME: deck
-      CORE_BRANCH: master
+      CORE_BRANCH: stable17
       DB: sqlite
   commands:
       - composer install
@@ -58,7 +58,7 @@ steps:
     image: nextcloudci/php7.2:php7.2-13
     environment:
       APP_NAME: deck
-      CORE_BRANCH: master
+      CORE_BRANCH: stable17
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -68,8 +68,8 @@ steps:
       - php occ app:enable deck
       - cd apps/$APP_NAME
       - composer install
-      - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-      - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
+      - ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+      - ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 trigger:
   branch:
     - master
@@ -85,7 +85,7 @@ steps:
     image: nextcloudci/php7.3:php7.3-5
     environment:
       APP_NAME: deck
-      CORE_BRANCH: master
+      CORE_BRANCH: stable17
       DB: sqlite
     commands:
       # Pre-setup steps
@@ -95,8 +95,8 @@ steps:
       - php occ app:enable deck
       - cd apps/$APP_NAME
       - composer install
-      - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-      - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
+      - ./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+      - ./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 trigger:
   branch:
     - master
@@ -112,7 +112,7 @@ steps:
     image: nextcloudci/php7.2:php7.2-13
     environment:
       APP_NAME: deck
-      CORE_BRANCH: master
+      CORE_BRANCH: stable17
       DB: sqlite
     commands:
       # Pre-setup steps
diff --git a/.travis.yml b/.travis.yml
index 3d15d0800..283ecafeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ php:
     - 7.2
     - 7.3
 env:
-    - CORE_BRANCH=master DB=mysql
+    - CORE_BRANCH=stable17 DB=mysql
 
 before_install:
     - export PATH="$PWD/vendor/bin:$PATH"
diff --git a/Makefile b/Makefile
index 29aa5327c..f0658df21 100644
--- a/Makefile
+++ b/Makefile
@@ -81,16 +81,8 @@ test: test-unit test-integration
 
 test-unit:
 	mkdir -p build/
-ifeq (, $(shell which phpunit 2> /dev/null))
-	@echo "No phpunit command available, downloading a copy from the web"
-	mkdir -p $(build_tools_directory)
-	curl -sSL https://phar.phpunit.de/phpunit-8.2.phar -o $(build_tools_directory)/phpunit.phar
-	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
-else
-	phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-	phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
-endif
+	./vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+	./vendor/bin/phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 
 test-integration:
 	cd tests/integration && ./run.sh
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 2cc3a38aa..174d358c6 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -17,7 +17,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>0.8.1</version>
+    <version>0.8.2</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
@@ -36,7 +36,7 @@
         <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
         <database min-version="5.5">mysql</database>
-        <nextcloud min-version="17" max-version="19" />
+        <nextcloud min-version="17" max-version="17" />
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>
diff --git a/composer.json b/composer.json
index 52017f826..5762e672d 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,6 @@
         "roave/security-advisories": "dev-master",
         "christophwurst/nextcloud": "^17",
         "jakub-onderka/php-parallel-lint": "^1.0.0",
-        "phpunit/phpunit": "^8"
+        "phpunit/phpunit": "6.5.*"
     }
 }
diff --git a/tests/unit/Activity/ActivityManagerTest.php b/tests/unit/Activity/ActivityManagerTest.php
index 7e541aa55..9fcf30029 100644
--- a/tests/unit/Activity/ActivityManagerTest.php
+++ b/tests/unit/Activity/ActivityManagerTest.php
@@ -97,7 +97,7 @@ class ActivityManagerTest extends TestCase {
 			if (strpos($constant, 'SUBJECT') === 0) {
 				$format = $this->activityManager->getActivityFormat($value, [], false);
 				if ($format !== '') {
-					$this->assertStringContainsString('{user}', $format);
+					$this->assertContains('{user}', $format);
 				} else {
 					/** @noinspection ForgottenDebugOutputInspection */
 					print_r('No activity string found for '. $constant . PHP_EOL);