diff --git a/run-compose.sh b/run-compose.sh
index e597723470bd94a4bab33d1cad4dc5badeabbd25..1008724d72ba410ac34c91c3b9179853a2bf362d 100755
--- a/run-compose.sh
+++ b/run-compose.sh
@@ -6,6 +6,8 @@ usage() {
     echo "    tests - run the test suite rather than the application."
 }
 
+set -x
+
 if [[ -z "${DATA_DIR}" ]]; then
     DATA_DIR=$(pwd)
 fi
@@ -16,8 +18,8 @@ while [ -n "$1" ]; do
         EXTRA_ARGS="--build"
         ;;
     tests)
-        docker-compose -f docker/docker-compose-test.yaml up --build --force-recreate
-        exit 0
+        docker-compose -f docker/docker-compose-test.yaml up --build --force-recreate --exit-code-from soar_flasgger_test
+        exit $?
         ;;
     *)
         usage