diff --git a/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml b/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml
index 8c579e1342..63c9f253fa 100644
--- a/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml
+++ b/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml
@@ -102,42 +102,7 @@ jobs:
         run: ./build.sh mocha
         shell: bash
 
-      - name: test-base-lib
+      - name: test-document-db
         if: ${{ success() || failure() }}
-        run: ./build.sh test-base-lib
-        shell: bash
-
-      - name: test-core
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-core
-        shell: bash
-
-      # - name: test-multi-tenancy
-      #   if: ${{ success() || failure() }}
-      #   run: ./build.sh test-multi-tenancy
-      #   shell: bash
-
-      - name: test-patching
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-patching
-        shell: bash
-
-      - name: test-code-gen
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-code-gen
-        shell: bash
-
-      - name: test-noda-time
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-noda-time
-        shell: bash
-
-      - name: test-aspnet-core
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-aspnet-core
-        shell: bash
-
-      - name: test-plv8
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-plv8
+        run: ./build.sh test-document-db
         shell: bash
\ No newline at end of file
diff --git a/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml b/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml
index 3388ebe02c..5b91bf2ee2 100644
--- a/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml
+++ b/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml
@@ -95,37 +95,7 @@ jobs:
         run: ./build.sh mocha
         shell: bash
 
-      - name: test-base-lib
+      - name: test-document-db
         if: ${{ success() || failure() }}
-        run: ./build.sh test-base-lib
-        shell: bash
-
-      - name: test-core
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-core
-        shell: bash
-
-      # - name: test-multi-tenancy
-      #   if: ${{ success() || failure() }}
-      #   run: ./build.sh test-multi-tenancy
-      #   shell: bash
-
-      - name: test-patching
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-patching
-        shell: bash
-
-      - name: test-code-gen
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-code-gen
-        shell: bash
-
-      - name: test-noda-time
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-noda-time
-        shell: bash
-
-      - name: test-aspnet-core
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-aspnet-core
+        run: ./build.sh test-document-db
         shell: bash
diff --git a/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml b/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml
index 8960529b98..a816a3256c 100644
--- a/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml
+++ b/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml
@@ -95,37 +95,7 @@ jobs:
         run: ./build.sh mocha
         shell: bash
 
-      - name: test-base-lib
+      - name: test-document-db
         if: ${{ success() || failure() }}
-        run: ./build.sh test-base-lib
-        shell: bash
-
-      - name: test-core
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-core
-        shell: bash
-
-      # - name: test-multi-tenancy
-      #   if: ${{ success() || failure() }}
-      #   run: ./build.sh test-multi-tenancy
-      #   shell: bash
-
-      - name: test-patching
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-patching
-        shell: bash
-
-      - name: test-code-gen
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-code-gen
-        shell: bash
-
-      - name: test-noda-time
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-noda-time
-        shell: bash
-
-      - name: test-aspnet-core
-        if: ${{ success() || failure() }}
-        run: ./build.sh test-aspnet-core
+        run: ./build.sh test-document-db
         shell: bash