diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0e3076da07225519fd892bbdaf6822dc79bf78c..51fbdd13dfab2b919f75557e854e7ac666b4ae31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -250,7 +250,7 @@ Unit Tests:
 CONUS 2018 Tests:
   artifacts:
     paths:
-      - build/reports/test
+      - build
   extends:
     - .java
   script:
@@ -259,7 +259,7 @@ CONUS 2018 Tests:
 Hawaii 2021 Tests:
   artifacts:
     paths:
-      - build/reports/test
+      - build
   extends:
     - .java
   script:
diff --git a/build.gradle b/build.gradle
index 2a2a4d6581c5040ebdfacc9841f2fbf96f8b4279..85b7b5fdcae4961e250f40a082763662baa86749 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,8 +82,7 @@ test {
   useJUnitPlatform()
 
   filter {
-    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsConus"
-    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsHawaii"
+    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests*"
   }
 }