diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index 4841a204248..0f32827952f 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -1004,6 +1004,7 @@ task:
   ###
   # Verify headerscheck / cpluspluscheck succeed
   #
+  # - Run both in same script to increase parallelism, use -k to get result of both
   # - Use -fmax-errors, as particularly cpluspluscheck can be very verbose
   ###
   always:
@@ -1014,9 +1015,7 @@ task:
         --quiet \
         CC="ccache gcc" CXX="ccache g++" CLANG="ccache clang"
       make -s -j${BUILD_JOBS} clean
-      time make -s headerscheck EXTRAFLAGS='-fmax-errors=10'
-    headers_cpluspluscheck_script: |
-      time make -s cpluspluscheck EXTRAFLAGS='-fmax-errors=10'
+      time make -s -j${BUILD_JOBS} -k ${CHECKFLAGS} headerscheck cpluspluscheck EXTRAFLAGS='-fmax-errors=10'
 
   always:
     upload_caches: ccache