diff --git a/.github/workflows/full-test-suite.yml b/.github/workflows/full-test-suite.yml
index 778b952be..1c58d31bb 100644
--- a/.github/workflows/full-test-suite.yml
+++ b/.github/workflows/full-test-suite.yml
@@ -11,12 +11,27 @@ permissions:
   contents: read
 
 jobs:
-  test_and_package_stage:
-    name: Test and package
-    uses: "./.github/workflows/test_and_package_stage.yml"
+  # These four jobs could be grouped in a separate workflow, but the github actions UI
+  # is much nicer if they are instead listed explicitly here.
+  standard_tests_jobs:
+    name: Standard tests
+    uses: "./.github/workflows/standard_tests_jobs.yml"
+  extended_tests_jobs:
+    name: Extended tests
+    uses: "./.github/workflows/extended_tests_jobs.yml"
+    secrets: inherit
+  docker_packaging_jobs:
+    name: Docker packaging
+    uses: "./.github/workflows/docker_packaging_jobs.yml"
     with:
       # We don't publish our Docker images in this pipeline, but when building them
       # for testing, let's use the nightly tag.
       dockerTag: nightly
+    secrets: inherit
+  snap_packaging_jobs:
+    name: Snap packaging
+    uses: "./.github/workflows/snap_packaging_jobs.yml"
+    with:
       snapBuildTimeout: 5400
     secrets: inherit
+
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2303292fe..26107f1f9 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -6,13 +6,25 @@ on:
   workflow_dispatch:
 
 jobs:
-  test_and_package_stage:
-    name: Test and Package
-    permissions:
-      contents: read
-    uses: "./.github/workflows/test_and_package_stage.yml"
+  # The first four jobs could be grouped in a separate workflow, but the github actions UI
+  # is much nicer if they are instead listed explicitly here.
+  standard_tests_jobs:
+    name: Standard tests
+    uses: "./.github/workflows/standard_tests_jobs.yml"
+  extended_tests_jobs:
+    name: Extended tests
+    uses: "./.github/workflows/extended_tests_jobs.yml"
+    secrets: inherit
+  docker_packaging_jobs:
+    name: Docker packaging
+    uses: "./.github/workflows/docker_packaging_jobs.yml"
     with:
       dockerTag: nightly
+    secrets: inherit
+  snap_packaging_jobs:
+    name: Snap packaging
+    uses: "./.github/workflows/snap_packaging_jobs.yml"
+    with:
       snapBuildTimeout: 19800
     secrets: inherit
   changelog_stage:
diff --git a/.github/workflows/test_and_package_stage.yml b/.github/workflows/test_and_package_stage.yml
deleted file mode 100644
index 7adc94095..000000000
--- a/.github/workflows/test_and_package_stage.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Test and package
-on:
-  workflow_call:
-    inputs:
-      dockerTag:
-        description: 'docker tag to push to'
-        type: string
-      snapBuildTimeout:
-        description: 'timeout for snap builds'
-        type: number
-permissions:
-  contents: read
-
-jobs:
-  # standard_tests_jobs:
-  #   name: Standard tests
-  #   uses: "./.github/workflows/standard_tests_jobs.yml"
-  # extended_tests_jobs:
-  #   name: Extended tests
-  #   uses: "./.github/workflows/extended_tests_jobs.yml"
-  #   secrets: inherit
-  # docker_packaging_jobs:
-  #   name: Docker packaging
-  #   uses: "./.github/workflows/docker_packaging_jobs.yml"
-  #   with:
-  #     dockerTag: ${{ inputs.dockerTag }}
-  #   secrets: inherit
-  snap_packaging_jobs:
-    name: Snap packaging
-    uses: "./.github/workflows/snap_packaging_jobs.yml"
-    with:
-      snapBuildTimeout: ${{ inputs.snapBuildTimeout }}
-    secrets: inherit