diff --git a/.github/workflows/ca-tests2.yml b/.github/workflows/ca-tests2.yml
index 61cd6787832..ed1626d1b98 100644
--- a/.github/workflows/ca-tests2.yml
+++ b/.github/workflows/ca-tests2.yml
@@ -77,62 +77,6 @@ jobs:
     with:
       db-image: ${{ needs.init.outputs.db-image }}
 
-  ca-lightweight-test:
-    name: Lightweight CA
-    needs: [init, build]
-    uses: ./.github/workflows/ca-lightweight-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
-  ca-lightweight-hsm-test:
-    name: Lightweight CA with HSM
-    needs: [init, build]
-    uses: ./.github/workflows/ca-lightweight-hsm-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
-  subca-basic-test:
-    name: Basic Sub-CA
-    needs: [init, build]
-    uses: ./.github/workflows/subca-basic-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
-  subca-cmc-test:
-    name: Sub-CA with CMC
-    needs: [init, build]
-    uses: ./.github/workflows/subca-cmc-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
-  subca-external-test:
-    name: Sub-CA with external cert
-    needs: [init, build]
-    uses: ./.github/workflows/subca-external-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
-  subca-hsm-test:
-    name: Sub-CA with HSM
-    needs: [init, build]
-    uses: ./.github/workflows/subca-hsm-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
-  subca-clone-test:
-    name: Sub-CA clone
-    needs: [init, build]
-    uses: ./.github/workflows/subca-clone-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
-  subca-clone-heml-test:
-    name: Sub-CA clone with HSM
-    needs: [init, build]
-    uses: ./.github/workflows/subca-clone-hsm-test.yml
-    with:
-      db-image: ${{ needs.init.outputs.db-image }}
-
   scep-test:
     name: SCEP responder
     needs: [init, build]
diff --git a/.github/workflows/ca-lightweight-hsm-test.yml b/.github/workflows/subca-lightweight-hsm-test.yml
similarity index 100%
rename from .github/workflows/ca-lightweight-hsm-test.yml
rename to .github/workflows/subca-lightweight-hsm-test.yml
diff --git a/.github/workflows/ca-lightweight-test.yml b/.github/workflows/subca-lightweight-test.yml
similarity index 100%
rename from .github/workflows/ca-lightweight-test.yml
rename to .github/workflows/subca-lightweight-test.yml
diff --git a/.github/workflows/subca-tests.yml b/.github/workflows/subca-tests.yml
new file mode 100644
index 00000000000..413c9c9fb35
--- /dev/null
+++ b/.github/workflows/subca-tests.yml
@@ -0,0 +1,71 @@
+name: SubCA Tests
+
+on: [push, pull_request]
+
+jobs:
+  init:
+    name: Initialization
+    uses: ./.github/workflows/init.yml
+    secrets: inherit
+
+  build:
+    name: Waiting for build
+    needs: init
+    uses: ./.github/workflows/wait-for-build.yml
+    secrets: inherit
+
+  subca-basic-test:
+    name: Basic SubCA
+    needs: [init, build]
+    uses: ./.github/workflows/subca-basic-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
+
+  subca-cmc-test:
+    name: SubCA with CMC
+    needs: [init, build]
+    uses: ./.github/workflows/subca-cmc-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
+
+  subca-external-test:
+    name: SubCA with external cert
+    needs: [init, build]
+    uses: ./.github/workflows/subca-external-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
+
+  subca-hsm-test:
+    name: SubCA with HSM
+    needs: [init, build]
+    uses: ./.github/workflows/subca-hsm-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
+
+  subca-clone-test:
+    name: SubCA clone
+    needs: [init, build]
+    uses: ./.github/workflows/subca-clone-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
+
+  subca-clone-heml-test:
+    name: SubCA clone with HSM
+    needs: [init, build]
+    uses: ./.github/workflows/subca-clone-hsm-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
+
+  subca-lightweight-test:
+    name: Lightweight SubCA
+    needs: [init, build]
+    uses: ./.github/workflows/subca-lightweight-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
+
+  subca-lightweight-hsm-test:
+    name: Lightweight SubCA with HSM
+    needs: [init, build]
+    uses: ./.github/workflows/subca-lightweight-hsm-test.yml
+    with:
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/README.md b/README.md
index a9eeff41418..300e247e962 100644
--- a/README.md
+++ b/README.md
@@ -79,18 +79,23 @@ See also [Building PKI](docs/development/Building_PKI.md).
 
 ## Testing
 
-| Test       | Status                                                                                                                                                                        |
-| ---------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| SonarCloud | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=dogtagpki_pki&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=dogtagpki_pki) |
-| CA         | [![CA Tests](https://github.com/dogtagpki/pki/actions/workflows/ca-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ca-tests.yml)                     |
-| KRA        | [![KRA Tests](https://github.com/dogtagpki/pki/actions/workflows/kra-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/kra-tests.yml)                  |
-| OCSP       | [![OCSP Tests](https://github.com/dogtagpki/pki/actions/workflows/ocsp-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ocsp-tests.yml)               |
-| TKS        | [![TKS Tests](https://github.com/dogtagpki/pki/actions/workflows/tks-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/tks-tests.yml)                  |
-| TPS        | [![TPS Tests](https://github.com/dogtagpki/pki/actions/workflows/tps-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/tps-tests.yml)                  |
-| ACME       | [![ACME Tests](https://github.com/dogtagpki/pki/actions/workflows/acme-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/acme-tests.yml)               |
-| Python     | [![Python Tests](https://github.com/dogtagpki/pki/actions/workflows/python-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/python-tests.yml)         |
-| Tools      | [![Tools Tests](https://github.com/dogtagpki/pki/actions/workflows/tools-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/tools-tests.yml)            |
-| IPA        | [![IPA Tests](https://github.com/dogtagpki/pki/actions/workflows/ipa-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ipa-tests.yml)                  |
+| Test           | Status                                                                                                                                                                        |
+| -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| SonarCloud     | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=dogtagpki_pki&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=dogtagpki_pki) |
+| CA Tests       | [![CA Tests](https://github.com/dogtagpki/pki/actions/workflows/ca-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ca-tests.yml)                     |
+| CA Tests 2     | [![CA Tests 2](https://github.com/dogtagpki/pki/actions/workflows/ca-tests2.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ca-tests2.yml)                 |
+| CA Clone Tests | [![CA Clone Tests](https://github.com/dogtagpki/pki/actions/workflows/ca-clone-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ca-clone-tests.yml)   |
+| SubCA Tests    | [![SubCA Tests](https://github.com/dogtagpki/pki/actions/workflows/subca-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/subca-tests.yml)            |
+| KRA Tests      | [![KRA Tests](https://github.com/dogtagpki/pki/actions/workflows/kra-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/kra-tests.yml)                  |
+| OCSP Tests     | [![OCSP Tests](https://github.com/dogtagpki/pki/actions/workflows/ocsp-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ocsp-tests.yml)               |
+| TKS Tests      | [![TKS Tests](https://github.com/dogtagpki/pki/actions/workflows/tks-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/tks-tests.yml)                  |
+| TPS Tests      | [![TPS Tests](https://github.com/dogtagpki/pki/actions/workflows/tps-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/tps-tests.yml)                  |
+| ACME Tests     | [![ACME Tests](https://github.com/dogtagpki/pki/actions/workflows/acme-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/acme-tests.yml)               |
+| EST Tests      | [![EST Tests](https://github.com/dogtagpki/pki/actions/workflows/est-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/est-tests.yml)                  |
+| Server Tests   | [![Server Tests](https://github.com/dogtagpki/pki/actions/workflows/server-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/server-tests.yml)         |
+| Python Tests   | [![Python Tests](https://github.com/dogtagpki/pki/actions/workflows/python-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/python-tests.yml)         |
+| Tools Tests    | [![Tools Tests](https://github.com/dogtagpki/pki/actions/workflows/tools-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/tools-tests.yml)            |
+| IPA Tests      | [![IPA Tests](https://github.com/dogtagpki/pki/actions/workflows/ipa-tests.yml/badge.svg)](https://github.com/dogtagpki/pki/actions/workflows/ipa-tests.yml)                  |
 
 ## Contributing