diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4f3637d6..c0e7b727 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,8 +24,10 @@ steps:
 
   - label: "🧪 Tests"
     key: tests
+    plugins: [$CI_TOOLKIT]
     command: |
-      xcodebuild test -project GravatarApp.xcodeproj -scheme GravatarApp -destination 'platform=iOS Simulator,name=iPhone 16,arch=arm64'
+      install_swiftpm_dependencies
+      make test
     notify:
       - github_commit_status:
           context: "Unit tests"
diff --git a/Makefile b/Makefile
index d277699e..d4ed5e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ help:  # Display this help.
 dev: # Open the package in xcode
 	xed .
 
+test: # Run the app unit tests
+	@xcodebuild test -project GravatarApp.xcodeproj -scheme GravatarApp -destination 'platform=iOS Simulator,name=iPhone 16 Pro'
+
 swiftformat: check-docker # Automatically find and fixes lint issues
 	@docker run --rm -v $(shell pwd):$(shell pwd) -w $(shell pwd) ghcr.io/nicklockwood/swiftformat:$(SWIFTFORMAT_VERSION) GravatarApp GravatarAppTests Packages