diff --git a/buildspecs/build.yml b/buildspecs/build.yml
index c2b63e4a83ad..6a3db75f7ded 100644
--- a/buildspecs/build.yml
+++ b/buildspecs/build.yml
@@ -15,4 +15,15 @@ phases:
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P mock-tests
-        fi
\ No newline at end of file
+        fi
+      # Codebuild doesn't have good support for mixed formats within the same
+      # directory tree so just excluding these for now. Only the TCK tests are
+      # based on TestNG.
+      - find ./ -name testng-native-results -prune -type d -exec rm -r {} \;
+      - find ./ -name testng-junit-results -prune -type d -exec rm -r {} \;
+
+reports:
+  UnitTests:
+    files:
+      - '**/*'
+    base-directory: '**/*/target/surefire-reports' # Location of the reports
diff --git a/buildspecs/integ-test.yml b/buildspecs/integ-test.yml
index 0280c3beb323..c5b81a567006 100644
--- a/buildspecs/integ-test.yml
+++ b/buildspecs/integ-test.yml
@@ -23,4 +23,15 @@ phases:
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P integ-tests
-        fi
\ No newline at end of file
+        fi
+      # Codebuild doesn't have good support for mixed formats within the same
+      # directory tree so just excluding these for now. Only the TCK tests are
+      # based on TestNG.
+      - find ./ -name testng-native-results -prune -type d -exec rm -r {} \;
+      - find ./ -name testng-junit-results -prune -type d -exec rm -r {} \;
+
+reports:
+  IntegTests:
+    files:
+      - '**/*'
+    base-directory: '**/*/target/surefire-reports' # Location of the reports
diff --git a/buildspecs/stability-test.yml b/buildspecs/stability-test.yml
index 90e60ee9f9a7..33ec4bb38e94 100644
--- a/buildspecs/stability-test.yml
+++ b/buildspecs/stability-test.yml
@@ -7,4 +7,15 @@ phases:
 
   build:
     commands:
-      - mvn clean install -P stability-tests -pl :stability-tests --am
\ No newline at end of file
+      - mvn clean install -P stability-tests -pl :stability-tests --am
+      # Codebuild doesn't have good support for mixed formats within the same
+      # directory tree so just excluding these for now. Only the TCK tests are
+      # based on TestNG.
+      - find ./ -name testng-native-results -prune -type d -exec rm -r {} \;
+      - find ./ -name testng-junit-results -prune -type d -exec rm -r {} \;
+
+reports:
+  StabilityTests:
+    files:
+      - '**/*'
+    base-directory: '**/*/target/surefire-reports' # Location of the reports