diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3809d134f4e11293265e604dc843db71fb0507e..1bfd6261986eb099a9ed09b5bc340d5f816a2b47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ variables:
   JUNIT_FILES: build/test-results/test/TEST-*.xml
   NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
   REPORTS_DIR: build/reports
-  JAVA_XMX: 32g
+  JAVA_XMX: 28g
 
 # Do not run for merge requests
 workflow:
@@ -247,7 +247,8 @@ NSHM Tests:
       - CMD: testConus2018
       - CMD: testHawaii2021
   script:
-    - ./gradlew ${CMD} || cat build/reports/test/index.html
+    - ./gradlew assemble
+    - ./gradlew ${CMD} --stacktrace || cat build/reports/test/index.html
   stage: test
 
 YAML Lint: