diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index dea9d42e267..f4948b3c16a 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -214,11 +214,7 @@ debian-testing-msan:
   script: |
     section_start lava-pytest "lava-pytest"
     .gitlab-ci/lava/lava-pytest.sh
-    section_switch shellcheck "shellcheck"
-    .gitlab-ci/run-shellcheck.sh
-    section_switch yamllint "yamllint"
-    .gitlab-ci/run-yamllint.sh
-    section_end yamllint
+    section_end lava-pytest
     .gitlab-ci/meson/build.sh
     .gitlab-ci/prepare-artifacts.sh
   timeout: 15m
diff --git a/.gitlab-ci/setup-test-env.sh b/.gitlab-ci/setup-test-env.sh
index 0cdd96ecff3..1fb8868d8d4 100644
--- a/.gitlab-ci/setup-test-env.sh
+++ b/.gitlab-ci/setup-test-env.sh
@@ -57,6 +57,12 @@ function section_start {
     [ "$state_x" -eq 0 ] || set -x
 }
 
+function uncollapsed_section_start {
+    x_off 2>/dev/null
+    build_section_start "" $*
+    [ "$state_x" -eq 0 ] || set -x
+}
+
 function build_section_end {
     echo -e "\e[0Ksection_end:$(date +%s):$1\r\e[0K"
     CURRENT_SECTION=""
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index f36e7964caf..e2d6ca8986b 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -71,13 +71,19 @@ python-test:
     - changes: *bin_ci_files
       when: manual
 
-toml-lint:
+yaml-toml-shell-test:
   extends:
     - python-test
     - .no-auto-retry  # this job can't be flaky
-  before_script:
+  script:
     - echo "If your change looks right but this script rejects it, contact @eric (GitLab) / eric_engestrom (IRC)."
+    - uncollapsed_section_start tomllint "tomllint"
     - python3 bin/toml_lint.py
+    - uncollapsed_section_switch yamllint "yamllint"
+    - .gitlab-ci/run-yamllint.sh
+    - uncollapsed_section_switch shellcheck "shellcheck"
+    - .gitlab-ci/run-shellcheck.sh
+    - section_end
   rules:
     - !reference [.disable-farm-mr-rules, rules]
     - !reference [.never-post-merge-rules, rules]