diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 995aeb5..e9648f4 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -43,8 +43,7 @@ jobs:
 
       - name: Test
         run: |
-          cd runtimes/cloudformation
-          go test -v ./...
+          make -C runtimes/cloudformation test
 
   build-cfn-runtime:
     name: Build CloudFormation runtime
diff --git a/runtimes/cloudformation/Makefile b/runtimes/cloudformation/Makefile
index 80eaf12..a090f6e 100644
--- a/runtimes/cloudformation/Makefile
+++ b/runtimes/cloudformation/Makefile
@@ -11,4 +11,7 @@ clean:
 	rm agent-kilt.zip || true
 	rm cmd/handler/handler || true
 
-.PHONY: clean
+test:
+	go test -v ./...
+
+.PHONY: clean test