diff --git a/Makefile b/Makefile
index 34ff7bae..4d8b86c7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ cuelint: cuefmt
 .PHONY: shellcheck
 shellcheck:
 	shellcheck ./tests/*.bats ./tests/*.bash
+	shellcheck ./universe/*.bats ./universe/*.bash
 
 .PHONY: lint
 lint: shellcheck cuelint golint check-buildkit-version docslint
diff --git a/stdlib/helpers.bash b/stdlib/helpers.bash
index 27e691ad..584e88ec 100644
--- a/stdlib/helpers.bash
+++ b/stdlib/helpers.bash
@@ -3,7 +3,7 @@ common_setup() {
     load 'node_modules/bats-assert/load'
 
     # Dagger Binary
-    DAGGER="${DAGGER_BINARY:-$(which dagger)}"
+    DAGGER="${DAGGER_BINARY:-$(command -v dagger)}"
     export DAGGER
 
     # Set the workspace to the universe directory (so tests can run from anywhere)