diff --git a/.github/workflows/buildout-27-52.yml b/.github/workflows/buildout-27-52.yml
deleted file mode 100644
index d6fa74c..0000000
--- a/.github/workflows/buildout-27-52.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: 2.7 5.2 Run buildout and instance
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: 2.7.18
-      - name: Caching
-        uses: actions/cache@v3.2.3
-        with:
-          path: |
-            eggs
-          key: cache-Py2.7-Plone5.2
-      - name: Install venv
-        run: |
-          pip install virtualenv
-          virtualenv -p 2 .
-          bin/pip install -r requirements.txt
-          bin/buildout -c test-5.2.x.cfg install instance
-      - name: Check that instance starts
-        run: |
-          bin/instance run startup.py
diff --git a/.github/workflows/buildout-38-52.yml b/.github/workflows/buildout-38-52.yml
deleted file mode 100644
index 51165f4..0000000
--- a/.github/workflows/buildout-38-52.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: 3.8 5.2 Run buildout and instance
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: 3.8
-      - name: Caching
-        uses: actions/cache@v3.2.3
-        with:
-          path: |
-            eggs
-          key: cache-Py3.8-Plone5.2
-      - name: Install venv
-        run: |
-          pip install virtualenv
-          virtualenv -p 3 .
-          bin/pip install -r requirements.txt
-          bin/buildout -c test-5.2.x.cfg install instance
-      - name: Check that instance starts
-        run: |
-          bin/instance run startup.py
diff --git a/.github/workflows/buildout-39-60.yml b/.github/workflows/buildout-39-60.yml
deleted file mode 100644
index ba0d27d..0000000
--- a/.github/workflows/buildout-39-60.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: 3.9 6.0 Run buildout and instance
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: 3.9
-      - name: Caching
-        uses: actions/cache@v3.2.3
-        with:
-          path: |
-            eggs
-          key: cache-Py3.9-Plone6.0
-      - name: Install venv
-        run: |
-          pip install virtualenv
-          virtualenv -p 3 .
-          bin/pip install -r requirements.txt
-          bin/buildout -c test-6.x.cfg install instance
-      - name: Check that instance starts
-        run: |
-          bin/instance run startup.py
diff --git a/.github/workflows/test-27-52.yml b/.github/workflows/test-27-52.yml
deleted file mode 100644
index 8dab05b..0000000
--- a/.github/workflows/test-27-52.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: 2.7 5.2 Run tests
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: 2.7
-      - name: Caching
-        uses: actions/cache@v3.2.3
-        with:
-          path: |
-            eggs
-          key: cache-Py2.7-Plone5.2
-      - name: Install venv
-        run: |
-          pip install virtualenv
-          virtualenv -p 2 .
-          bin/pip install -r requirements.txt
-          bin/buildout -c test-5.2.x.cfg install test
-      - name: Run unit tests
-        run: |
-          bin/test
diff --git a/.github/workflows/test-38-52.yml b/.github/workflows/test-38-52.yml
deleted file mode 100644
index ac42f86..0000000
--- a/.github/workflows/test-38-52.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: 3.8 5.2 Run tests
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: 3.8
-      - name: Caching
-        uses: actions/cache@v3.2.3
-        with:
-          path: |
-            eggs
-          key: cache-Py3.8-Plone5.2
-      - name: Install venv
-        run: |
-          pip install virtualenv
-          virtualenv -p 3 .
-          bin/pip install -r requirements.txt
-          bin/buildout -c test-5.2.x.cfg install test
-      - name: Run unit tests
-        run: |
-          bin/test
diff --git a/.github/workflows/test-39-60.yml b/.github/workflows/test-39-60.yml
deleted file mode 100644
index 338a1c5..0000000
--- a/.github/workflows/test-39-60.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: 3.9 6.0 Run tests
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3.3.0
-      - name: Set up python
-        uses: actions/setup-python@v4.5.0
-        with:
-          python-version: 3.9
-      - name: Caching
-        uses: actions/cache@v3.2.3
-        with:
-          path: |
-            eggs
-          key: cache-Py3.9-Plone6.0
-      - name: Install venv
-        run: |
-          pip install virtualenv
-          virtualenv -p 3 .
-          bin/pip install -r requirements.txt
-          bin/buildout -c test-6.x.cfg install test
-      - name: Run unit tests
-        run: |
-          bin/test
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..3b56aa2
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,58 @@
+on: [push, pull_request]
+name: Run buildout and check instance
+jobs:
+  instance:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: "2.7"
+            plone-version: "5.2"
+            os: "ubuntu-20.04"
+          - python-version: "3.8"
+            plone-version: "5.2"
+            os: "ubuntu-latest"
+          - python-version: "3.9"
+            plone-version: "6.0"
+            os: "ubuntu-latest"
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.plone-version }}-${{ matrix.python-version }} start instance
+    steps:
+      - uses: actions/checkout@v3.3.0
+      - uses: collective/buildout.plonetest/.github/actions/buildout@gha-buildout-action
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          python-version: ${{ matrix.python-version }}
+          plone-version: ${{ matrix.plone-version }}
+          buildout-parts: "instance"
+      - name: Check that instance starts
+        run: |
+          bin/instance run startup.py
+  all_tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: "2.7"
+            plone-version: "5.2"
+            os: "ubuntu-20.04"
+          - python-version: "3.8"
+            plone-version: "5.2"
+            os: "ubuntu-latest"
+          - python-version: "3.9"
+            plone-version: "6.0"
+            os: "ubuntu-latest"
+    needs: instance
+    name: ${{ matrix.plone-version }}-${{ matrix.python-version }} run tests
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3.3.0
+      - uses: collective/buildout.plonetest/.github/actions/buildout@gha-buildout-action
+        with:
+          github-token: ${{ secrets.github-token }}
+          python-version: ${{ matrix.python-version }}
+          plone-version:  ${{ matrix.plone-version }}
+          buildout-parts: "test"
+      - name: Run unit tests
+        run: |
+          bin/test
diff --git a/requirements.txt b/requirements-5.2.txt
similarity index 100%
rename from requirements.txt
rename to requirements-5.2.txt
diff --git a/requirements-6.0.txt b/requirements-6.0.txt
new file mode 100644
index 0000000..d5d2e6a
--- /dev/null
+++ b/requirements-6.0.txt
@@ -0,0 +1,4 @@
+zc.buildout==3.0.1
+setuptools==42.0.2
+wheel==0.37.1
+pip<21.0
diff --git a/test-6.x.cfg b/test-6.0.x.cfg
similarity index 100%
rename from test-6.x.cfg
rename to test-6.0.x.cfg