diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 1b956547..ab0003f4 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -14,7 +14,7 @@ jobs:
       continue-on-error: ${{ matrix.experimental }}
       matrix:
         python-version: [3.8]
-        plone-version: [5.2]
+        plone-version: [52]
         experimental: [false]
         include:
           - python-version: 3.11
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 109b87d9..cab4c898 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,16 +14,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9]
+        python-version: [3.8]
         plone-version: [5.2]
         experimental: [false]
         include:
-          - python-version: 3.8
-            plone-version: "6.0"
-            experimental: true
-          - python-version: 3.9
-            plone-version: "6.0"
-            experimental: true
           - python-version: "3.10"
             plone-version: "6.0"
             experimental: true
diff --git a/actions/buildout/action.yml b/actions/buildout/action.yml
index ebd2d46b..cf27a446 100644
--- a/actions/buildout/action.yml
+++ b/actions/buildout/action.yml
@@ -18,9 +18,9 @@ runs:
     - name: Install dependencies
       run: |
         pip install -U pip setuptools coveralls coverage mockito pre-commit
-        pip install -r https://dist.plone.org/release/${{ inputs.plone-version }}-latest/requirements.txt
+        pip install -r requirements-${{ inputs.plone-version }}.txt
       shell: bash
     - name: buildout
       run: |
-        buildout -c test_plone${{ inputs.plone-version }}.cfg buildout:download-cache=./buildout-cache/downloads buildout:eggs-directory=./buildout-cache/eggs
+        buildout -c test-${{ inputs.plone-version }}.cfg buildout:download-cache=./buildout-cache/downloads buildout:eggs-directory=./buildout-cache/eggs
       shell: bash
diff --git a/requirements-5.2.txt b/requirements-5.2.txt
new file mode 100644
index 00000000..9b1741bd
--- /dev/null
+++ b/requirements-5.2.txt
@@ -0,0 +1,11 @@
+setuptools==65.7.0
+zc.buildout==3.0.1
+wheel==0.38.4
+
+# Windows specific down here (has to be installed here, fails in buildout)
+# Dependency of zope.sendmail:
+pywin32 ; platform_system == 'Windows'
+# SSL Certs on Windows, because Python is missing them otherwise:
+certifi ; platform_system == 'Windows'
+# Dependency of collective.recipe.omelette:
+ntfsutils ; platform_system == 'Windows' and python_version < '3.0'
diff --git a/requirements-6.0.txt b/requirements-6.0.txt
new file mode 100644
index 00000000..ad561194
--- /dev/null
+++ b/requirements-6.0.txt
@@ -0,0 +1,16 @@
+pip==23.3.1
+setuptools==69.0.2
+wheel==0.42.0
+zc.buildout==3.0.1
+
+# Windows specific down here (has to be installed here, fails in buildout)
+# Dependency of zope.sendmail:
+pywin32 ; platform_system == 'Windows'
+
+# SSL Certs on windows, because Python is missing them otherwise:
+certifi ; platform_system == 'Windows'
+
+# VSCode robotframework-lsp requires robotframework directly in venv
+robotframework==6.0.2
+# robotframework >= 6.1 is only supported with robotframwork-lsp >= 1.11.0,
+# but https://github.com/robocorp/robotframework-lsp/issues/947
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..9b1741bd
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+setuptools==65.7.0
+zc.buildout==3.0.1
+wheel==0.38.4
+
+# Windows specific down here (has to be installed here, fails in buildout)
+# Dependency of zope.sendmail:
+pywin32 ; platform_system == 'Windows'
+# SSL Certs on Windows, because Python is missing them otherwise:
+certifi ; platform_system == 'Windows'
+# Dependency of collective.recipe.omelette:
+ntfsutils ; platform_system == 'Windows' and python_version < '3.0'
diff --git a/test_plone52.cfg b/test-5.2.cfg
similarity index 100%
rename from test_plone52.cfg
rename to test-5.2.cfg
diff --git a/test_plone60.cfg b/test-6.0.cfg
similarity index 100%
rename from test_plone60.cfg
rename to test-6.0.cfg