diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1477199a..e485b918 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -170,9 +170,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run shellcheck on tests/e2e/*.sh
-        run: |
-          sudo apt-get update -qq && sudo apt-get install -y -qq shellcheck
-          shellcheck --severity=warning tests/e2e/*.sh
+        uses: ludeeus/action-shellcheck@master
+        env:
+          SHELLCHECK_OPTS: --severity=warning
+        with:
+          scandir: tests/e2e
 
   python-lint:
     name: Python Lint & Test
diff --git a/tests/e2e/_extract_token.py b/tests/e2e/_extract_token.py
index 83941cf3..bf6b78be 100755
--- a/tests/e2e/_extract_token.py
+++ b/tests/e2e/_extract_token.py
@@ -13,7 +13,7 @@ import sys
 
 try:
     data = json.load(sys.stdin)
-except Exception as e:
+except (json.JSONDecodeError, ValueError) as e:
     sys.stderr.write(f"e2e_extract_token: invalid JSON response ({e})\n")
     print("")
     raise SystemExit(0)