diff --git a/Makefile b/Makefile
index b46181de..9a1a424c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ export GOPRIVATE=coopcloud.tech
 all: format check build
 
 run:
-	@go run -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA)
+	@go run -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA) $(ARGS)
 
 install:
 	@go install -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA)
@@ -40,11 +40,17 @@ check:
 	(echo "gofmt: formatting issue - run 'make format' to resolve" && exit 1)
 
 test:
-	@go test ./... -cover -v -p 1
+	@go test ./... -short -cover -v -p 1
+
+integration-test:
+	@go test ./... -short=false -failfast -cover -v -p 1 -count=1
 
 find-tests:
 	@find . -name "*_test.go"
 
+find-integration-test:
+	@find . -iname "*_e2e_test.go"
+
 loc:
 	@find . -name "*.go" | xargs wc -l
 
diff --git a/flake.nix b/flake.nix
index fdc35b22..a187ec81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,11 @@
           packages = with pkgs; [
             go_1_26
             gnumake
+            (bats.withLibraries (libraries: [
+              libraries.bats-support
+              libraries.bats-assert
+              libraries.bats-file
+            ]))
           ];
         };
       }