diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 68231fb7..3423f0b7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Check commit message compliance of the pull request
         if: github.event_name == 'pull_request'
         run: |
-          ./run-tests.sh --check-commitlint ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} ${{ github.event.pull_request.head.sha }}
+          ./run-tests.sh --check-commitlint ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.number }}
 
   lint-shellcheck:
     runs-on: ubuntu-20.04
diff --git a/etc/job_wrapper.sh b/etc/job_wrapper.sh
index f4eb90f9..d1b79898 100755
--- a/etc/job_wrapper.sh
+++ b/etc/job_wrapper.sh
@@ -7,15 +7,16 @@
 # around by dumping command to a
 # temporary wrapper file.
 tmpjob=$(mktemp -p .)
-chmod +x $tmpjob
+chmod +x "$tmpjob"
 echo "command to execute:"
 # $@ input is base64 encoded string of command to execute
+# shellcheck disable=SC2068,SC2294
 eval $@
 
-echo "$@" "|bash" > $tmpjob
-bash $tmpjob
+echo "$@" "|bash" > "$tmpjob"
+bash "$tmpjob"
 res=$?
-rm $tmpjob
+rm "$tmpjob"
 
 if [ $res != 0 ]; then
     echo "[Error] Execution failed with error code: $res"
diff --git a/run-tests.sh b/run-tests.sh
index ed9b5704..2bdbf838 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -60,13 +60,14 @@ stop_db_container () {
 check_commitlint () {
     from=${2:-master}
     to=${3:-HEAD}
+    pr=${4:-[0-9]+}
     npx commitlint --from="$from" --to="$to"
     found=0
     while IFS= read -r line; do
-        if echo "$line" | grep -qP "\(\#[0-9]+\)$"; then
+        if echo "$line" | grep -qP "\(\#$pr\)$"; then
             true
         else
-            echo "✖   PR number missing in $line"
+            echo "✖   Headline does not end by '(#$pr)' PR number: $line"
             found=1
         fi
     done < <(git log "$from..$to" --format="%s")
@@ -76,7 +77,7 @@ check_commitlint () {
 }
 
 check_shellcheck () {
-    find . -name "*.sh" -exec shellcheck {} \;
+    find . -name "*.sh" -exec shellcheck {} \+
 }
 
 check_pydocstyle () {