diff --git a/.drone.star b/.drone.star
index 55de18b318..1a5fc2970d 100644
--- a/.drone.star
+++ b/.drone.star
@@ -232,13 +232,12 @@ def virtualViews():
                 "name": "APIAcceptanceTestsOcisStorage",
                 "image": OC_CI_PHP,
                 "commands": [
-                    "cd /drone/src",
+                    "cd /drone/src/tmp/testrunner",
                     "composer self-update",
                     "composer --version",
-                    "make test-acceptance-api",
+                    "make test-acceptance-from-core-api",
                 ],
                 "environment": {
-                    "PATH_TO_APITESTS": "/drone/src/tmp/testrunner",
                     "TEST_SERVER_URL": "http://revad-services:20180",
                     "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
                     "DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/spaces/* /drone/src/tmp/reva/data/blobs/* /drone/src/tmp/reva/data/indexes",
diff --git a/Makefile b/Makefile
index 45b89dfbbc..c7075ed568 100644
--- a/Makefile
+++ b/Makefile
@@ -173,16 +173,6 @@ mockery: $(MOCKERY)
 go-generate:
 	go generate ./...
 
-BEHAT_BIN=vendor-bin/behat/vendor/bin/behat
-# behat config file for core api tests
-CORE_BEHAT_YML=$(PATH_TO_APITESTS)/tests/acceptance/config/behat-core.yml
-
-test-acceptance-api: vendor-bin/behat/vendor
-	BEHAT_BIN=$(BEHAT_BIN) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api
-
-test-acceptance-core-api: vendor-bin/behat/vendor
-	BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api
-
 vendor/bamarni/composer-bin-plugin: composer.lock
 	composer install
 
diff --git a/README.md b/README.md
index e01ba092d7..bce5f4d9a9 100644
--- a/README.md
+++ b/README.md
@@ -132,9 +132,9 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
     ../../../cmd/revad/revad -c ldap-users.toml
     ```
 
-3.  clone ownCloud 10
+3.  clone ownCloud Infinite Scale `OCIS`
     ```
-    git clone https://github.com/owncloud/core.git ./testrunner
+    git clone https://github.com/owncloud/ocis.git ./testrunner
     ```
 
 4.  to run the correct version of the testsuite check out the commit id from the `.drone.env` file
@@ -156,7 +156,7 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
     TEST_REVA='true' \
     BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@provisioning_api-app-required&&~@preview-extension-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage&&~@skipOnOcis' \
     EXPECTED_FAILURES_FILE=../reva/tests/acceptance/expected-failures-on-OCIS-storage.md \
-    make test-acceptance-api
+    make test-acceptance-from-core-api
     ```
 
     This will run all tests that are relevant to reva.
diff --git a/tests/acceptance/features/bootstrap/bootstrap.php b/tests/acceptance/features/bootstrap/bootstrap.php
index 23204c3688..1921389f0c 100644
--- a/tests/acceptance/features/bootstrap/bootstrap.php
+++ b/tests/acceptance/features/bootstrap/bootstrap.php
@@ -1,14 +1,9 @@
 <?php
-$pathToApiTests = \getenv('PATH_TO_APITESTS');
-if ($pathToApiTests === false) {
-    $pathToApiTests = "../ocis";
-}
-
-require_once $pathToApiTests . '/tests/acceptance/features/bootstrap/bootstrap.php';
+require_once '../ocis/tests/acceptance/features/bootstrap/bootstrap.php';
 
 $classLoader = new \Composer\Autoload\ClassLoader();
 $classLoader->addPsr4(
-	"", $pathToApiTests . "/tests/acceptance/features/bootstrap", true
+	"", "../ocis/tests/acceptance/features/bootstrap", true
 );
 
 $classLoader->register();