diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 9f988d00d..34afec837 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -96,9 +96,9 @@ jobs:
       - uses: actions/checkout@v2
       - name: vars
         run: |
-          echo 'VERSION=v0.7.2' >> $GITHUB_ENV
+          echo 'VERSION=v0.8.0' >> $GITHUB_ENV
           echo 'BASEURL=https://github.com/koalaman/shellcheck/releases/download' >> $GITHUB_ENV
-          echo 'SHA256SUM=12ee2e0b90a3d1e9cae24ac9b2838be66b48573cb2c8e8f3c566b959df6f050c' >> $GITHUB_ENV
+          echo 'SHA256SUM=f4bce23c11c3919c1b20bcb0f206f6b44c44e26f2bc95f8aa708716095fa0651' >> $GITHUB_ENV
           echo ~/bin >> $GITHUB_PATH
       - name: install shellcheck
         run: |
diff --git a/tests/integration/events.bats b/tests/integration/events.bats
index 9d28420e5..a8fe52baf 100644
--- a/tests/integration/events.bats
+++ b/tests/integration/events.bats
@@ -10,6 +10,7 @@ function teardown() {
 	teardown_bundle
 }
 
+# shellcheck disable=SC2030
 @test "events --stats" {
 	# XXX: currently cgroups require root containers.
 	requires root
@@ -38,6 +39,7 @@ function test_events() {
 	fi
 
 	runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
+	# shellcheck disable=SC2031
 	[ "$status" -eq 0 ]
 
 	# Spawn two subshels:
diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash
index b6d2e244c..de6bf7050 100644
--- a/tests/integration/helpers.bash
+++ b/tests/integration/helpers.bash
@@ -29,7 +29,7 @@ command -v criu &>/dev/null && HAVE_CRIU=yes
 # Kernel version
 KERNEL_VERSION="$(uname -r)"
 KERNEL_MAJOR="${KERNEL_VERSION%%.*}"
-KERNEL_MINOR="${KERNEL_VERSION#$KERNEL_MAJOR.}"
+KERNEL_MINOR="${KERNEL_VERSION#"$KERNEL_MAJOR".}"
 KERNEL_MINOR="${KERNEL_MINOR%%.*}"
 
 ARCH=$(uname -m)