diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e6bcb78dfda545db365967379368f96d9129e7a..fe91137db7390b2cdcd2ee5aa313a5c38f1510bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,15 +226,7 @@ Markdown Lint:
     - ./gradlew markdownlint
   stage: test
 
-YAML Lint:
-  allow_failure: true
-  needs: []
-  script:
-    - ./gradlew nodeInstall
-    - ./gradlew yamllint
-  stage: test
-
-Unit Tests:
+NSHM Test:
   artifacts:
     paths:
       - ${JACOCO_HTML_DIR}
@@ -242,16 +234,30 @@ Unit Tests:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
+  parallel:
+    matrix:
+      - NSHM: Alaska2007
+      - NSHM: Alaska2023
+      - NSHM: Conus2018
+      - NSHM: Conus2023
+      - NSHM: Hawaii2021
   script:
-    - ./gradlew check
+    - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
+    - export CI_RUNNER_MEMORY
+    - ./gradlew generate${NSHM} --info
+    - ./gradlew test${NSHM} --info
     - cat ${JACOCO_HTML_DIR}/index.html
   stage: test
 
-####
-# NSHMS Tests
-####
+YAML Lint:
+  allow_failure: true
+  needs: []
+  script:
+    - ./gradlew nodeInstall
+    - ./gradlew yamllint
+  stage: test
 
-.nshm-test:
+Unit Tests:
   artifacts:
     paths:
       - ${JACOCO_HTML_DIR}
@@ -259,49 +265,10 @@ Unit Tests:
       junit: ${JUNIT_FILES}
   coverage: '/Total.*?([0-9]{1,3})%/'
   needs: []
-  before_script:
-    - CI_RUNNER_MEMORY="$(awk '/MemTotal/ {printf( "%d\n", $2 / 1024 / 1024 * .90 )}' /proc/meminfo)g"
-    - export CI_RUNNER_MEMORY
-    - ./gradlew ${CMD} --info
-  after_script:
-    - cat ${JACOCO_HTML_DIR}/index.html
-
-Alaska 2007 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew testAlaska2007 --info
-  stage: alaska-test
-
-Alaska 2023 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew testAlaska2023 --info
-  stage: alaska-test
-
-CONUS 2018 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew generateConus2018 --info
-    - ./gradlew testConus2018 --info
-  stage: conus-test
-
-CONUS 2023 NSHM Test:
-  extends:
-    - .nshm-test
   script:
-    - ./gradlew generateConus2023 --info
-    - ./gradlew testConus2023 --info
-  stage: conus-test
-
-Hawaii 2021 NSHM Test:
-  extends:
-    - .nshm-test
-  script:
-    - ./gradlew testHawaii2021 --info
-  stage: hawaii-test
+    - ./gradlew check
+    - cat ${JACOCO_HTML_DIR}/index.html
+  stage: test
 
 ####
 # Stage: trigger