diff --git a/Tests/Acceptance/_envs/local-headless.yml b/Tests/Acceptance/_envs/local-headless.yml
deleted file mode 100644
index 53819c42..00000000
--- a/Tests/Acceptance/_envs/local-headless.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-modules:
-  enabled:
-    - WebDriver:
-        host: 'localhost'
-        extendedDebugging: true
-        port: 9515
-        url: 'http://0.0.0.0:8888/'
-        clear_cookies: true
-        cleanSession: true
-        browser: chrome
-        window_size: '1850x1024'
-        capabilities:
-          name: 'container tests'
-          extendedDebugging: true
-          chromeOptions:
-            w3c: false
-            args: ["--disable-gpu", "--headless", "--disable-dev-shm-usage", "--no-sandbox", "--disable-extensions", "--hide-scrollbars"]
diff --git a/Tests/Acceptance/_envs/local.yml b/Tests/Acceptance/_envs/local.yml
deleted file mode 100644
index eb749643..00000000
--- a/Tests/Acceptance/_envs/local.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-modules:
-  enabled:
-    - WebDriver:
-        host: 'localhost'
-        extendedDebugging: true
-        port: 9515
-        url: 'http://0.0.0.0:8888/'
-        clear_cookies: true
-        cleanSession: true
-        browser: chrome
-        window_size: '1850x1024'
-        capabilities:
-          name: 'container tests'
-          extendedDebugging: true
-          chromeOptions:
-            w3c: false
-            args: ["--disable-gpu", "--disable-dev-shm-usage", "--no-sandbox", "--disable-extensions", "--hide-scrollbars"]
diff --git a/Tests/README.md b/Tests/README.md
index faf5de92..ae91ba93 100644
--- a/Tests/README.md
+++ b/Tests/README.md
@@ -21,15 +21,13 @@
     .Build/bin/typo3 extension:setup
     # run php webserver and chromedriver
     php -S 0.0.0.0:8888 -t .Build/Web/ &
-    chromedriver --url-base=/wd/hub  &
+    chromedriver --url-base=/wd/hub  --port=9515 &
     # create database with "_at" postfix
     mysql -e 'CREATE DATABASE IF NOT EXISTS foox_at;'
 
- adapt Tests/Acceptance/_envs/local.yml and/or .env if required
-
  ## Run tests
 
 
     .Build/bin/phpunit -c Build/phpunit/UnitTests.xml Tests/Unit/
     .Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml Tests/Functional
-    .Build/bin/codecept run Backend --env=local -c Tests/codeception.yml
+    .Build/bin/codecept run Backend --env=local,classic -c Tests/codeception.yml
diff --git a/Tests/codeception.yml b/Tests/codeception.yml
index db2001fa..8ee4f031 100644
--- a/Tests/codeception.yml
+++ b/Tests/codeception.yml
@@ -43,6 +43,15 @@ env:
   #      capabilities:
   #        goog:chromeOptions:
   #          args: ["headless", "no-sandbox", "disable-gpu"]
+  local:
+    modules:
+      config:
+        WebDriver:
+          path: /wd/hub
+          url: 'http://0.0.0.0:8888/'
+          capabilities:
+            goog:chromeOptions:
+              args: ["no-sandbox", "disable-gpu"]
 params:
   - parameters.yml
   - env
\ No newline at end of file