diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b93241b9dd..b354a9e4d5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -54,7 +54,7 @@ jobs:
 
       # buildout
       - name: buildout
-        run: buildout -t 10 -c plone-${{ matrix.plone-version }}.x.cfg
+        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.8' ]; then buildout -t 10 -c plone-6.0.x-python3.8.cfg; else buildout -t 10 -c plone-${{ matrix.plone-version }}.x.cfg; fi;
         env:
           CI: true
 
diff --git a/plone-6.0.x-python3.8.cfg b/plone-6.0.x-python3.8.cfg
new file mode 100644
index 0000000000..5c418ddfe0
--- /dev/null
+++ b/plone-6.0.x-python3.8.cfg
@@ -0,0 +1,22 @@
+[buildout]
+extends =
+    https://dist.plone.org/release/6.0.11.1/versions.cfg
+    base.cfg
+
+[buildout:python37]
+parts =
+    test
+    code-analysis
+
+[instance]
+recipe = plone.recipe.zope2instance
+zodb-temporary-storage = off
+
+[versions]
+pygments = 2.14.0
+plone.app.linkintegrity = 4.0.3
+robotframework-browser = 17.5.2
+robotframework-assertion-engine = 2.0.0
+robotframework-debuglibrary = 2.3.0
+robotframework-pythonlibcore = 4.2.0
+grpcio-tools = 1.59.0