diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-tests-pebble.yml
similarity index 67%
rename from .github/workflows/run-all-tests.yml
rename to .github/workflows/run-tests-pebble.yml
index 7bb05dc..0e26962 100644
--- a/.github/workflows/run-all-tests.yml
+++ b/.github/workflows/run-tests-pebble.yml
@@ -1,4 +1,4 @@
-name: Run all tests
+name: Run all tests on pebble
 on:
   push:
     branches:
@@ -15,14 +15,6 @@ jobs:
         run: docker-compose up -d --build
       - name: Run test suite on Alpine
         run: test/run-test.sh alpine
-  test-centos6:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
-      - name: Run test suite on CentOS6
-        run: test/run-test.sh centos6
   test-centos7:
       runs-on: ubuntu-latest
       steps:
@@ -31,14 +23,6 @@ jobs:
           run: docker-compose up -d --build
         - name: Run test suite on CentOS7
           run: test/run-test.sh centos7
-  test-centos7-staging:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
-      - name: Run test suite on CentOS7 against Staging using DuckDNS
-        run: test/run-test.sh centos7-staging
   test-centos8:
     runs-on: ubuntu-latest
     steps:
@@ -79,12 +63,3 @@ jobs:
         run: docker-compose up -d --build
       - name: Run test suite on Ubuntu18
         run: test/run-test.sh ubuntu18
-  test-ubuntu-staging:
-    needs: test-centos7-staging
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
-      - name: Run test suite on Ubuntu against Staging using DuckDNS
-        run: test/run-test.sh ubuntu-staging
diff --git a/.github/workflows/run-tests-staging-duckdns.yml b/.github/workflows/run-tests-staging-duckdns.yml
new file mode 100644
index 0000000..54da950
--- /dev/null
+++ b/.github/workflows/run-tests-staging-duckdns.yml
@@ -0,0 +1,25 @@
+name: Run all tests using DuckDNS
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  test-centos7-duckdns:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build the docker-compose stack
+        run: docker-compose up -d --build
+      - name: Run test suite on CentOS7 against Staging using DuckDNS
+        run: test/run-test.sh centos7-duckdns
+  test-ubuntu-duckdns:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build the docker-compose stack
+        run: docker-compose up -d --build
+      - name: Run test suite on Ubuntu against Staging using DuckDNS
+        run: test/run-test.sh ubuntu-duckdns
diff --git a/.github/workflows/run-tests-staging-dynu.yml b/.github/workflows/run-tests-staging-dynu.yml
new file mode 100644
index 0000000..c523278
--- /dev/null
+++ b/.github/workflows/run-tests-staging-dynu.yml
@@ -0,0 +1,25 @@
+name: Run all tests using Dynu
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  test-centos7-dynu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build the docker-compose stack
+        run: docker-compose up -d --build
+      - name: Run test suite on CentOS7 against Staging using Dynu
+        run: test/run-test.sh centos7-dynu
+  test-ubuntu-dynu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Build the docker-compose stack
+        run: docker-compose up -d --build
+      - name: Run test suite on Ubuntu against Staging using Dynu
+        run: test/run-test.sh ubuntu-dynu