diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a911799c0..dca86cab7 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -61,4 +61,4 @@ jobs:
         run: |
           gtimeout 60 bash -c 'while ! wget -O /dev/null -T 1 http://localhost:4444/readyz; do echo waiting for selenium server; sleep 1; done' || (cat selenium-standalone.log && exit 2)
 
-          tox -e tests_selenium_remote_safari -- --cache-clear -n 1  || tox -e tests_selenium_remote_safari -- -n 1 --last-failed --last-failed-no-failures none
+          tox -e tests_selenium_remote_safari -- -n 1  || tox -e tests_selenium_remote_safari -- -n 1 --last-failed --last-failed-no-failures none
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c0337690c..5bc926023 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -44,4 +44,5 @@ jobs:
 
       - name: Run tests for windows-only drivers
         run: |
-          tox -e tests_selenium_edge -- --cache-clear -n 4  || tox -e tests_selenium_edge -- -n 1 --last-failed --last-failed-no-failures none
+          tox -e tests_selenium_edge -- -n 4  || tox -e tests_selenium_edge -- -n 1 --last-failed --last-failed-no-failures none
+          tox -e tests_selenium_edge -- --webdriver-fullscreen True -n 4  || tox -e tests_selenium_edge -- --webdriver-fullscreen True -n 1 --last-failed --last-failed-no-failures none
diff --git a/pytest.ini b/pytest.ini
index 7a2de44dc..18012a840 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,2 @@
 [pytest]
-addopts = -v --durations=10
+addopts = -v  --cache-clear --durations=10
diff --git a/tox.ini b/tox.ini
index 2961a2e0d..6c3ae6599 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,7 +48,6 @@ passenv =
   EDGEWEBDRIVER
 commands =
     pytest --ignore-flaky {posargs} --browser=edge tests/test_all_drivers tests/tests_webdriver tests/tests_webdriver_local
-    pytest --ignore-flaky {posargs} --browser=edge --webdriver-fullscreen True tests/test_all_drivers tests/tests_webdriver tests/tests_webdriver_local
 
 [testenv:tests_selenium_remote_chrome]
 extras = selenium