diff --git a/.drone.star b/.drone.star
index cded769c0..dd46a7679 100644
--- a/.drone.star
+++ b/.drone.star
@@ -809,7 +809,6 @@ def localApiTests(suite, storage, extra_environment = {}):
         "TEST_SERVER_URL": "https://ocis-server:9200",
         "OCIS_REVA_DATA_ROOT": "%s" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""),
         "OCIS_SKELETON_STRATEGY": "%s" % ("copy" if storage == "owncloud" else "upload"),
-        "TEST_OCIS": "true",
         "SEND_SCENARIO_LINE_REFERENCES": "true",
         "STORAGE_DRIVER": storage,
         "BEHAT_SUITE": suite,
@@ -994,7 +993,6 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac
                              "TEST_SERVER_URL": "https://ocis-server:9200",
                              "OCIS_REVA_DATA_ROOT": "%s" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""),
                              "OCIS_SKELETON_STRATEGY": "%s" % ("copy" if storage == "owncloud" else "upload"),
-                             "TEST_OCIS": "true",
                              "SEND_SCENARIO_LINE_REFERENCES": "true",
                              "STORAGE_DRIVER": storage,
                              "BEHAT_FILTER_TAGS": filterTags,
@@ -1103,7 +1101,6 @@ def uiTestPipeline(ctx, filterTags, runPart = 1, numberOfParts = 1, storage = "o
                          "environment": {
                              "SERVER_HOST": "https://ocis-server:9200",
                              "BACKEND_HOST": "https://ocis-server:9200",
-                             "RUN_ON_OCIS": "true",
                              "OCIS_REVA_DATA_ROOT": "%s" % dirs["ocisRevaDataRoot"],
                              "WEB_UI_CONFIG_FILE": "%s/%s" % (dirs["base"], dirs["ocisConfig"]),
                              "TEST_TAGS": finalFilterTags,
diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md
index 3341f3a19..65df0a865 100644
--- a/docs/ocis/development/testing.md
+++ b/docs/ocis/development/testing.md
@@ -224,7 +224,6 @@ ocis/bin/ocis server
 make test-acceptance-api \
 TEST_SERVER_URL=https://localhost:9200 \
 TEST_WITH_GRAPH_API=true \
-TEST_OCIS=true \
 ```
 
 #### Run Tests Transferred From ownCloud Core (prefix `coreApi`)
@@ -233,7 +232,6 @@ TEST_OCIS=true \
 make test-acceptance-from-core-api \
 TEST_SERVER_URL=https://localhost:9200 \
 TEST_WITH_GRAPH_API=true \
-TEST_OCIS=true \
 ```
 
 Useful environment variables:
@@ -291,7 +289,6 @@ If you want to work on a specific issue
    ```bash
    make test-acceptance-from-core-api \
    TEST_SERVER_URL=https://localhost:9200 \
-   TEST_OCIS=true \
    TEST_WITH_GRAPH_API=true \
    STORAGE_DRIVER=OCIS \
    BEHAT_FEATURE='tests/acceptance/features/coreApiVersions/fileVersions.feature:147'
@@ -330,7 +327,6 @@ PROXY_ENABLE_BASIC_AUTH=true \
 ```bash
 OCIS_WRAPPER_URL=http://localhost:5200 \
 TEST_WITH_GRAPH_API=true \
-TEST_OCIS=true \
 TEST_SERVER_URL="https://localhost:9200" \
 BEHAT_FEATURE=tests/acceptance/features/apiAsyncUpload/delayPostprocessing.feature \
 make test-acceptance-api
@@ -379,7 +375,6 @@ Run the acceptance test with the following command:
 
 ```bash
 TEST_WITH_GRAPH_API=true \
-TEST_OCIS=true \
 TEST_SERVER_URL="https://localhost:9200" \
 EMAIL_HOST="localhost" \
 EMAIL_PORT=9000 \
@@ -423,7 +418,6 @@ Run the acceptance test with the following command:
 
 ```bash
 TEST_WITH_GRAPH_API=true \
-TEST_OCIS=true \
 TEST_SERVER_URL="https://localhost:9200" \
 BEHAT_FEATURE="tests/acceptance/features/apiSearch/contentSearch.feature" \
 make test-acceptance-api
@@ -464,7 +458,6 @@ make test-paralleldeployment-api \
 TEST_SERVER_URL="https://cloud.owncloud.test" \
 TEST_OC10_URL="http://localhost:8080" \
 TEST_PARALLEL_DEPLOYMENT=true \
-TEST_OCIS=true \
 TEST_WITH_LDAP=true \
 PATH_TO_CORE="<path_to_core>" \
 SKELETON_DIR="<path_to_core>/apps/testing/data/apiSkeleton"
@@ -547,7 +540,6 @@ Run the acceptance test with the following command:
 
 ```bash
 TEST_WITH_GRAPH_API=true \
-TEST_OCIS=true \
 TEST_SERVER_URL="https://localhost:9200" \
 BEHAT_FEATURE="tests/acceptance/features/apiAntivirus/antivirus.feature" \
 make test-acceptance-api
diff --git a/tests/acceptance/docker/src/acceptance.yml b/tests/acceptance/docker/src/acceptance.yml
index 2f1cb18ce..85a78c254 100644
--- a/tests/acceptance/docker/src/acceptance.yml
+++ b/tests/acceptance/docker/src/acceptance.yml
@@ -5,8 +5,6 @@ services:
     command: /bin/bash /test/run-tests.sh
     environment:
       OCIS_ROOT: /drone/src
-      TEST_OCIS: "true"
-      RUN_ON_OCIS: "true"
       TEST_SERVER_URL: https://ocis-server:9200
       TEST_WITH_GRAPH_API: "true"
       OCIS_WRAPPER_URL: http://ocis-server:5200
diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh
index f40818d5c..af5eb2559 100755
--- a/tests/acceptance/run.sh
+++ b/tests/acceptance/run.sh
@@ -529,14 +529,6 @@ export IPV4_URL
 export IPV6_URL
 export FILES_FOR_UPLOAD="${SCRIPT_PATH}/filesForUpload/"
 
-if [ "${TEST_OCIS}" != "true" ] && [ "${TEST_REVA}" != "true" ]
-then
-	# We are testing on an ownCloud core server.
-	# Tell the tests to wait 1 second between each upload/delete action
-	# to avoid problems with actions that depend on timestamps in seconds.
-	export UPLOAD_DELETE_WAIT_TIME=1
-fi
-
 TEST_LOG_FILE=$(mktemp)
 SCENARIOS_THAT_PASSED=0
 SCENARIOS_THAT_FAILED=0