diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 79d2891..ee219b9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,12 +12,21 @@ jobs:
       matrix:
         python:
           - "3.8"
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
         plone:
           - "6.0-latest"
+          - "6.1-latest"
+        exclude:
+          - python: "3.10"
+            plone: "6.0-latest"
+          - python: "3.12"
+            plone: "6.0-latest"
+          - python: "3.8"
+            plone: "6.1-latest"
+          - python: "3.11"
+            plone: "6.1-latest"
 
     steps:
       - uses: actions/checkout@v4
@@ -28,8 +37,6 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
           plone-version: ${{ matrix.plone }}
-          setuptools-version: 69.5.1
-          additional-eggs: 'setuptools'
       - name: Install package
         run: |
           make install
diff --git a/.gitignore b/.gitignore
index fc71f6a..9afa3e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ __pycache__/
 .tox
 .vscode/
 node_modules/
+forest.dot
+forest.json
 
 # venv / buildout related
 bin/
@@ -46,7 +48,8 @@ local.cfg
 /venv/
 .installed.txt
 
-forest.*
+robot_*
+test_*
 
 ##
 # Add extra configuration options in .meta.toml:
diff --git a/.meta.toml b/.meta.toml
index 2d3a1b6..b841a77 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -3,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "a89af8f2"
+commit-id = "4cf2df11"
 
 [pyproject]
 codespell_skip = "*.js,*.min.js,*.min.js.map,*.min.css.map,*.svg,*.lock,*.json"
@@ -17,5 +17,6 @@ jobs = [
 
 [gitignore]
 extra_lines = """
-forest.*
+robot_*
+test_*
 """
diff --git a/setup.py b/setup.py
index 03de70c..6bba7c3 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,6 @@
             "zest.releaser[recommended]",
         ],
         "test": [
-            "collective.MockMailHost",
             "mock",
             "plone.api",
             "plone.app.caching",
@@ -65,7 +64,7 @@
             "plone.app.querystring",
             "plone.app.robotframework[debug]",
             "plone.app.testing",
-            "plone.restapi",
+            "plone.restapi[test]",
             "plone.testing",
             "requests",
         ],