diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 841d602..14819af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,15 +30,9 @@ jobs:
       - name: Test
         id: test
         run: make test
-      - name: Zip XCResults
-        id: zip-xcresults
-        if: failure() && steps.test.conclusion == 'failure'
-        run: |
-          cd $(dirname $(find ${{ env.derived-data-path }} -name "*.xcresult" | head -n1))
-          zip -r xcresults.zip *.xcresult
-      - name: Upload XCResults
-        if: failure() && steps.zip-xcresults.conclusion == 'success'
-        uses: actions/upload-artifact@v2
+      - name: Process XCResult
+        uses: lunij/xcresulttool@marc/update
+        if: success() || failure()
         with:
-          name: xcresults.zip
-          path: ./xcresults.zip
+          path: .derivedData/Netbob.xcresult
+          title: XCResult
diff --git a/Makefile b/Makefile
index 562e7b5..c49c4b4 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ XCODEBUILD_OPTIONS = \
 	-scheme $(SCHEME_PACKAGE) \
 	-workspace .
 
+XCODEBUILD_TEST_OPTIONS = -resultBundlePath $(DERIVED_DATA_PATH)/$(SCHEME_PACKAGE)
+
 export TUIST_STATS_OPT_OUT := true
 
 .PHONY: setup-mise
@@ -47,7 +49,7 @@ build:
 
 .PHONY: test
 test:
-	set -o pipefail && xcodebuild $(XCODEBUILD_OPTIONS) test-without-building | xcbeautify
+	set -o pipefail && xcodebuild $(XCODEBUILD_OPTIONS) $(XCODEBUILD_TEST_OPTIONS) test-without-building | xcbeautify
 
 .PHONY: clean
 clean:
diff --git a/Tests/TestPlans/Netbob.xctestplan b/Tests/TestPlans/Netbob.xctestplan
index 28fb2ec..b0c016a 100644
--- a/Tests/TestPlans/Netbob.xctestplan
+++ b/Tests/TestPlans/Netbob.xctestplan
@@ -9,6 +9,15 @@
     }
   ],
   "defaultOptions" : {
+    "codeCoverage" : {
+      "targets" : [
+        {
+          "containerPath" : "container:",
+          "identifier" : "Netbob",
+          "name" : "Netbob"
+        }
+      ]
+    },
     "language" : "en",
     "region" : "US",
     "testExecutionOrdering" : "random",