diff --git a/.drone.yml b/.drone.yml
index 09719bda6..526bd1e7d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -129,6 +129,24 @@ pipeline:
     when:
       matrix:
         TESTS: php7.1
+  integration:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    environment:
+      - APP_NAME=deck
+      - CORE_BRANCH=master
+      - 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/
+      - php occ app:enable deck
+      - cd apps/$APP_NAME
+      - cd tests/integration
+      - ./run.sh
+    when:
+      matrix:
+        TESTS: integration
   jsbuild:
     image: mhart/alpine-node:6.8.0
     commands:
@@ -149,5 +167,6 @@ matrix:
     - TESTS: php7.0
     - TESTS: php7.1
     - TESTS: jsbuild
+    - TESTS: integration
 
 branches: [ master, stable* ]
diff --git a/.gitignore b/.gitignore
index 9d188b68e..ee470a22c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ js/node_modules/*
 js/vendor/
 build/
 js/public/
+tests/integration/vendor/
+tests/integration/composer.lock
diff --git a/Makefile b/Makefile
index b33771854..b018d1035 100644
--- a/Makefile
+++ b/Makefile
@@ -69,8 +69,9 @@ appstore: clean-build build
 
 	echo $(appstore_package_name).tar.gz
 
+test: test-unit test-integration
 
-test:
+test-unit:
 	mkdir -p build/
 ifeq (, $(shell which phpunit 2> /dev/null))
 	@echo "No phpunit command available, downloading a copy from the web"
@@ -83,6 +84,9 @@ else
 	phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 endif
 
-test-js:
-	cd js &&  run test
+test-integration:
+	cd tests/integration && ./run.sh
+
+test-js: install-deps
+	cd js && run test