diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
deleted file mode 100644
index dbd62a6c..00000000
--- a/.github/workflows/examples.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Examples
-
-on: [push, pull_request, workflow_dispatch]
-
-env:
-  FORCE_COLOR: 1
-
-jobs:
-  examples:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["pypy-3.7", "3.9"]
-        target: [
-            "src-layout",
-            "adhoc-layout",
-        ]
-        include:
-          # Add new helper variables to existing jobs
-          - {python-version: "pypy-3.7", tox-python-version: "pypy3"}
-          - {python-version: "3.9", tox-python-version: "py39"}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key:
-            examples-v1-${{ hashFiles('**/tox.ini') }}
-          restore-keys: |
-            examples-v1-
-
-      - name: Install dependencies
-        run: |
-          python -m pip install -U pip
-          python -m pip install -U wheel
-          python -m pip install --progress-bar=off tox -rci/requirements.txt
-
-      - name: Examples
-        run: |
-          cd examples/${{ matrix.target }}
-          tox -v -e ${{ matrix.tox-python-version }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3ad0bb49..a24e60d5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,47 @@
 name: Tests
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 jobs:
+  examples:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["pypy-3.7", "3.9"]
+        target: [
+            "src-layout",
+            "adhoc-layout",
+        ]
+        include:
+          # Add new helper variables to existing jobs
+          - {python-version: "pypy-3.7", tox-python-version: "pypy3"}
+          - {python-version: "3.9", tox-python-version: "py39"}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key:
+            examples-v1-${{ hashFiles('**/tox.ini') }}
+          restore-keys: |
+            examples-v1-
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U wheel
+          python -m pip install --progress-bar=off tox -rci/requirements.txt
+
+      - name: Examples
+        run: |
+          cd examples/${{ matrix.target }}
+          tox -v -e ${{ matrix.tox-python-version }}
   test:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
@@ -165,3 +206,15 @@ jobs:
         TOXPYTHON: '${{ matrix.toxpython }}'
       run: >
         tox -e ${{ matrix.tox_env }} -v
+
+    - name: all checks pass
+      if: always()
+      needs:
+        - test
+        - examples
+      runs-on: ubuntu-latest
+      steps:
+        - name: Decide whether the needed jobs succeeded or failed
+          uses: re-actors/alls-green@release/v1
+          with:
+            jobs: ${{ toJSON(needs) }}
diff --git a/ci/templates/.github/workflows/test.yml b/ci/templates/.github/workflows/test.yml
index fda6886a..4d5d62f3 100644
--- a/ci/templates/.github/workflows/test.yml
+++ b/ci/templates/.github/workflows/test.yml
@@ -1,6 +1,50 @@
 name: Tests
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 jobs:
+{%- raw %}
+  examples:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["pypy-3.7", "3.9"]
+        target: [
+            "src-layout",
+            "adhoc-layout",
+        ]
+        include:
+          # Add new helper variables to existing jobs
+          - {python-version: "pypy-3.7", tox-python-version: "pypy3"}
+          - {python-version: "3.9", tox-python-version: "py39"}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key:
+            examples-v1-${{ hashFiles('**/tox.ini') }}
+          restore-keys: |
+            examples-v1-
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U wheel
+          python -m pip install --progress-bar=off tox -rci/requirements.txt
+
+      - name: Examples
+        run: |
+          cd examples/${{ matrix.target }}
+          tox -v -e ${{ matrix.tox-python-version }}
+{%- endraw %}
+
   test:
     name: {{ '${{ matrix.name }}' }}
     runs-on: {{ '${{ matrix.os }}' }}
@@ -63,3 +107,15 @@ jobs:
         TOXPYTHON: '{{ '${{ matrix.toxpython }}' }}'
       run: >
         tox -e {{ '${{ matrix.tox_env }}' }} -v
+
+    - name: all checks pass
+      if: always()
+      needs:
+        - test
+        - examples
+      runs-on: ubuntu-latest
+      steps:
+        - name: Decide whether the needed jobs succeeded or failed
+          uses: re-actors/alls-green@release/v1
+          with:
+            jobs: {{ '${{ toJSON(needs) }}' }}