diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
new file mode 100644
index 0000000..01ca427
--- /dev/null
+++ b/.github/workflows/shellcheck.yml
@@ -0,0 +1,16 @@
+name: shellcheck
+on: pull_request
+jobs:
+
+  build:
+    name: Run shellcheck
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Run checks
+      run: |
+        shellcheck --version
+        shellcheck -e SC1091 tests/*.sh tests/*/*.sh
diff --git a/tests/commands/create_multipart_upload.sh b/tests/commands/create_multipart_upload.sh
index b9b60d2..c5e68c4 100644
--- a/tests/commands/create_multipart_upload.sh
+++ b/tests/commands/create_multipart_upload.sh
@@ -56,7 +56,7 @@ create_multipart_upload_custom() {
   local multipart_data
   log 5 "additional create multipart params"
   for i in "$@"; do
-    log 5 $i
+    log 5 "$i"
   done
   log 5 "${*:3}"
   log 5 "aws --no-verify-ssl s3api create-multipart-upload --bucket $1 --key $2 ${*:3}"
diff --git a/tests/commands/list_buckets.sh b/tests/commands/list_buckets.sh
index 8e72450..9e2340e 100644
--- a/tests/commands/list_buckets.sh
+++ b/tests/commands/list_buckets.sh
@@ -7,7 +7,6 @@ list_buckets() {
   fi
 
   local exit_code=0
-  local error
   if [[ $1 == 's3' ]]; then
     buckets=$(aws --no-verify-ssl s3 ls 2>&1 s3://) || exit_code=$?
   elif [[ $1 == 's3api' ]] || [[ $1 == 'aws' ]]; then
diff --git a/tests/run.sh b/tests/run.sh
index 542d51c..a5826cd 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -88,4 +88,5 @@ case $command_type in
     ;;
 esac
 
+# shellcheck disable=SC2086
 exit $exit_code
diff --git a/tests/util.sh b/tests/util.sh
index 8079da7..18d9f39 100644
--- a/tests/util.sh
+++ b/tests/util.sh
@@ -231,6 +231,7 @@ object_exists() {
     echo "error checking if object exists"
     return 2
   fi
+  # shellcheck disable=SC2086
   return $head_result
 }
 
@@ -493,6 +494,7 @@ check_object_tags_empty() {
     return 2
   fi
   check_tags_empty "$1" || local check_result=$?
+  # shellcheck disable=SC2086
   return $check_result
 }
 
@@ -506,6 +508,7 @@ check_bucket_tags_empty() {
     return 2
   fi
   check_tags_empty "$1" || local check_result=$?
+  # shellcheck disable=SC2086
   return $check_result
 }