diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ba0c43952b2bda3aaba7e87aaf44aba02bde287..3fb882d2531f2a8794b031d284fa77e8aa327abc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,9 @@ workflow:
 stages:
   - build
   - test
+  - alaska-test
+  - conus-test
+  - hawaii-test
   - trigger
 
 default:
@@ -223,6 +226,31 @@ Markdown Lint:
     - ./gradlew markdownlint
   stage: test
 
+YAML Lint:
+  allow_failure: true
+  needs: []
+  script:
+    - ./gradlew nodeInstall
+    - ./gradlew yamllint
+  stage: test
+
+Unit Tests:
+  artifacts:
+    paths:
+      - ${JACOCO_HTML_DIR}
+    reports:
+      junit: ${JUNIT_FILES}
+  coverage: '/Total.*?([0-9]{1,3})%/'
+  needs: []
+  script:
+    - ./gradlew check
+    - cat ${JACOCO_HTML_DIR}/index.html
+  stage: test
+
+####
+# NSHMS Tests
+####
+
 .nshm-test:
   artifacts:
     paths:
@@ -237,7 +265,6 @@ Markdown Lint:
     - ./gradlew ${CMD} --info
   after_script:
     - cat ${JACOCO_HTML_DIR}/index.html
-  stage: test
 
 .alaska-sites: &alaska-sites
   - TEST_SITE: ANCHORAGE_AK
@@ -251,6 +278,7 @@ Alaska 2007 NSHM Test:
     - .nshm-test
   script:
     - ./gradlew testAlaska2007 --info
+  stage: alaska-test
 
 Alaska 2023 NSHM Test:
   extends:
@@ -260,6 +288,7 @@ Alaska 2023 NSHM Test:
       *alaska-sites
   script:
     - ./gradlew testAlaska2023 -DTEST_SITE=${TEST_SITE} --info
+  stage: alaska-test
 
 .conus-sites: &conus-sites
   - TEST_SITE: LOS_ANGELES_CA
@@ -280,6 +309,7 @@ CONUS 2018 NSHM Test:
       *conus-sites
   script:
     - ./gradlew testConus2018 -DTEST_SITE=${TEST_SITE} --info
+  stage: conus-test
 
 CONUS 2023 NSHM Test:
   extends:
@@ -289,33 +319,14 @@ CONUS 2023 NSHM Test:
       *conus-sites
   script:
     - ./gradlew testConus2023 -DTEST_SITE=${TEST_SITE} --info
+  stage: conus-test
 
 Hawaii 2021 NSHM Test:
   extends:
     - .nshm-test
   script:
     - ./gradlew testHawaii2021 --info
-
-YAML Lint:
-  allow_failure: true
-  needs: []
-  script:
-    - ./gradlew nodeInstall
-    - ./gradlew yamllint
-  stage: test
-
-Unit Tests:
-  artifacts:
-    paths:
-      - ${JACOCO_HTML_DIR}
-    reports:
-      junit: ${JUNIT_FILES}
-  coverage: '/Total.*?([0-9]{1,3})%/'
-  needs: []
-  script:
-    - ./gradlew check
-    - cat ${JACOCO_HTML_DIR}/index.html
-  stage: test
+  stage: hawaii-test
 
 ####
 # Stage: trigger