diff --git a/build.gradle b/build.gradle
index 3ba4f3ca2aa7fcf18159169869607f97b02014c9..55928268c641450f8bb154ae2d3d702e812a79b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,9 @@ tasks.withType(JavaCompile) {
 }
 
 tasks.withType(JavaExec) {
-  dependsOn downloadNshms
+  // CONUS 2018 is the default model used for web serivces
+  // See src/main/resources/application.yml
+  dependsOn conus2018
   jvmArgs(
       '-noverify',
       '-Xms2g',
@@ -74,52 +76,10 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
   }
 }
 
-tasks.withType(Test) {
-  dependsOn downloadNshms
-}
-
 test {
   useJUnitPlatform()
 
   filter {
-    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests*"
-  }
-}
-
-task testConus2018(type: Test) {
-  description = "Test CONUS 2018 NSHM"
-  group = "verification"
-
-  testLogging {
-    exceptionFormat "full"
-  }
-
-  useJUnitPlatform()
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx8g",
-      )
-
-  filter {
-    includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsConus2018"
-  }
-}
-
-task testHawaii2021(type: Test) {
-  description = "Test Hawaii 2021 NSHM"
-  group = "verification"
-
-  testLogging {
-    exceptionFormat "full"
-  }
-
-  useJUnitPlatform()
-  jvmArgs(
-      "-Xms2g",
-      "-Xmx8g",
-      )
-
-  filter {
-    includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsHawaii2021"
+    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests"
   }
 }