diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04bb908d8dcae08d6db2cba34a23e44875e79194..2921957241b52b9ca6bc4f22da9f6fa54075e49d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,7 +223,7 @@ Markdown Lint:
     - ./gradlew markdownlint
   stage: test
 
-NSHM Tests:
+.nshm-test:
   artifacts:
     paths:
       - ${JACOCO_HTML_DIR}
@@ -231,49 +231,49 @@ NSHM Tests:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
-  parallel:
-    matrix:
-      - CMD: testAlaska2007
-        TEST_SITE:
-          - ANCHORAGE_AK
-          - FAIRBANKS_AK
-          - JUNEAU_AK
-          - KODIAK_AK
-          - VALDEZ_AK
-      - CMD: testAlaska2023
-        TEST_SITE:
-          - ANCHORAGE_AK
-          - FAIRBANKS_AK
-          - JUNEAU_AK
-          - KODIAK_AK
-          - VALDEZ_AK
-      - CMD: testConus2018
-        TEST_SITE:
-          - LOS_ANGELES_CA
-          - SAN_FRANCISCO_CA
-          - SEATTLE_WA
-          - SALT_LAKE_CITY_UT
-          - RENO_NV
-          - NEW_MADRID_MO
-          - BOSTON_MA
-          - NEW_YORK_NY
-          - CHICAGO_IL
-      - CMD: testConus2023
-        TEST_SITE:
-          - LOS_ANGELES_CA
-          - SAN_FRANCISCO_CA
-          - SEATTLE_WA
-          - SALT_LAKE_CITY_UT
-          - RENO_NV
-          - NEW_MADRID_MO
-          - BOSTON_MA
-          - NEW_YORK_NY
-          - CHICAGO_IL
-      - CMD: testHawaii2021
-        TEST_SITE:
-          - HILO_HI
-          - HONOLULU_HI
-          - KAILUA_KONA_HI
+  # parallel:
+  #   matrix:
+  #     - CMD: testAlaska2007
+  #       TEST_SITE:
+  #         - ANCHORAGE_AK
+  #         - FAIRBANKS_AK
+  #         - JUNEAU_AK
+  #         - KODIAK_AK
+  #         - VALDEZ_AK
+  #     - CMD: testAlaska2023
+  #       TEST_SITE:
+  #         - ANCHORAGE_AK
+  #         - FAIRBANKS_AK
+  #         - JUNEAU_AK
+  #         - KODIAK_AK
+  #         - VALDEZ_AK
+  #     - CMD: testConus2018
+  #       TEST_SITE:
+  #         - LOS_ANGELES_CA
+  #         - SAN_FRANCISCO_CA
+  #         - SEATTLE_WA
+  #         - SALT_LAKE_CITY_UT
+  #         - RENO_NV
+  #         - NEW_MADRID_MO
+  #         - BOSTON_MA
+  #         - NEW_YORK_NY
+  #         - CHICAGO_IL
+  #     - CMD: testConus2023
+  #       TEST_SITE:
+  #         - LOS_ANGELES_CA
+  #         - SAN_FRANCISCO_CA
+  #         - SEATTLE_WA
+  #         - SALT_LAKE_CITY_UT
+  #         - RENO_NV
+  #         - NEW_MADRID_MO
+  #         - BOSTON_MA
+  #         - NEW_YORK_NY
+  #         - CHICAGO_IL
+  #     - CMD: testHawaii2021
+  #       TEST_SITE:
+  #         - HILO_HI
+  #         - HONOLULU_HI
+  #         - KAILUA_KONA_HI
   script:
     - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
     - export CI_RUNNER_MEMORY
@@ -281,6 +281,52 @@ NSHM Tests:
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
+Alaska 2007 NSHM Test:
+  extends:
+    - .nshm-test
+  variables:
+    CMD: testAlaska2007
+
+Alaska 2023 NSHM Test:
+  extends:
+    - .nshm-test
+  variables:
+    CMD: testAlaska2023
+
+CONUS 2018 NSHM Test:
+  extends:
+    - .nshm-test
+  parallel:
+    matrix:
+      - TEST_SITE: LOS_ANGELES_CA
+      - TEST_SITE: SAN_FRANCISCO_CA
+      - TEST_SITE: SEATTLE_WA
+      - TEST_SITE: SALT_LAKE_CITY_UT
+      - TEST_SITE: RENO_NV
+      - TEST_SITE: NEW_MADRID_MO
+      - TEST_SITE: BOSTON_MA
+      - TEST_SITE: NEW_YORK_NY
+      - TEST_SITE: CHICAGO_IL
+  variables:
+    CMD: testConus2018
+
+CONUS 2023 NSHM Test:
+  extends:
+    - .nshm-test
+  parallel:
+    matrix:
+      - TEST_SITE: LOS_ANGELES_CA
+      - TEST_SITE: SAN_FRANCISCO_CA
+      - TEST_SITE: SEATTLE_WA
+      - TEST_SITE: SALT_LAKE_CITY_UT
+      - TEST_SITE: RENO_NV
+      - TEST_SITE: NEW_MADRID_MO
+      - TEST_SITE: BOSTON_MA
+      - TEST_SITE: NEW_YORK_NY
+      - TEST_SITE: CHICAGO_IL
+  variables:
+    CMD: testConus2023
+
 YAML Lint:
   allow_failure: true
   needs: []