diff --git a/shellcheck/launch_shellcheck.sh b/shellcheck/launch_shellcheck.sh
index c54d455..cd34f73 100755
--- a/shellcheck/launch_shellcheck.sh
+++ b/shellcheck/launch_shellcheck.sh
@@ -14,7 +14,7 @@ fi
 for f in $files; do
     if head "$f" | grep -qE "^# run-shellcheck$"; then
         printf "\e[1;36mRunning shellcheck on: %s  \e[0m\n" "$f"
-        if ! /usr/bin/shellcheck --color=always --shell=bash -e SC1091 "$f"; then
+        if ! /usr/bin/shellcheck --color=always --shell=bash -x --source-path=SCRIPTDIR "$f"; then
             retval=$((retval + 1))
         fi
     fi
diff --git a/tests/hardening/4.1.1.1_audit_log_storage.sh b/tests/hardening/4.1.1.1_audit_log_storage.sh
index 8f4e661..f6927c9 100644
--- a/tests/hardening/4.1.1.1_audit_log_storage.sh
+++ b/tests/hardening/4.1.1.1_audit_log_storage.sh
@@ -4,9 +4,9 @@ test_audit() {
     describe Running on blank host
     register_test retvalshouldbe 0
     dismiss_count_for_test
-    # shellcheck disable=2154
     mkdir -p /etc/audit
     touch /etc/audit/auditd.conf
+    # shellcheck disable=2154
     run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
 
     describe Correcting situation
diff --git a/tests/hardening/4.1.1.2_halt_when_audit_log_full.sh b/tests/hardening/4.1.1.2_halt_when_audit_log_full.sh
index 5ca43b6..2ca9174 100644
--- a/tests/hardening/4.1.1.2_halt_when_audit_log_full.sh
+++ b/tests/hardening/4.1.1.2_halt_when_audit_log_full.sh
@@ -4,9 +4,9 @@ test_audit() {
     describe Running on blank host
     register_test retvalshouldbe 0
     dismiss_count_for_test
-    # shellcheck disable=2154
     mkdir -p /etc/audit
     touch /etc/audit/auditd.conf
+    # shellcheck disable=2154
     run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
 
     describe Correcting situation
diff --git a/tests/hardening/4.1.1.3_keep_all_audit_logs.sh b/tests/hardening/4.1.1.3_keep_all_audit_logs.sh
index 8a56bc2..b85adcb 100644
--- a/tests/hardening/4.1.1.3_keep_all_audit_logs.sh
+++ b/tests/hardening/4.1.1.3_keep_all_audit_logs.sh
@@ -4,9 +4,9 @@ test_audit() {
     describe Running on blank host
     register_test retvalshouldbe 0
     dismiss_count_for_test
-    # shellcheck disable=2154
     mkdir -p /etc/audit
     touch /etc/audit/auditd.conf
+    # shellcheck disable=2154
     run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
 
     describe Correcting situation