diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index e951a913ed36142759dcc95508ab2cc1c2e1abbd..cb390cc0f69f32493f83e9f6a2fcbb8a84469c2a 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -84,16 +84,14 @@ class NshmTestUtils {
    * @param nshm The NSHM to test
    */
   static void testNshm(Nshm nshm, Optional<Path> dataPath) {
-    NshmModel nshmModel = dataPath.isPresent() ? null : loadModel(nshm);
+    NshmModel nshmModel = loadModel(nshm);
 
     for (NamedLocation location : nshm.locations()) {
       LOGGER.info("Location: " + location.toString());
       compareCurves(nshmModel, location, dataPath);
     }
 
-    if (nshmModel != null) {
-      nshmModel.exec.shutdown();
-    }
+    nshmModel.exec.shutdown();
   }
 
   /**