diff --git a/tox.ini b/tox.ini
index 1eb80d0d5e..8ecc63d37c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -91,7 +91,7 @@ commands =
 description = Fill the tests using EELS (with Python)
 commands =
     fill \
-        -m "not slow and not zkevm and not benchmark" \
+        -m "not slow and not benchmark" \
         -n auto --maxprocesses 10 --dist=loadgroup \
         --skip-index \
         --cov-config=pyproject.toml \
@@ -123,12 +123,12 @@ commands =
         --tb=no \
         --show-capture=no \
         --disable-warnings \
-        -m "not slow and not zkevm and not benchmark" \
+        -m "not slow and not benchmark and not derived_test" \
         -n auto --maxprocesses 7 --dist=loadgroup \
         --basetemp="{temp_dir}/pytest" \
         --log-to "{toxworkdir}/logs" \
         --clean \
-        --until BPO4 \
+        --until Amsterdam \
         {posargs} \
         tests