diff --git a/docker/context/fish_run_tests.sh b/docker/context/fish_run_tests.sh
index 65595cba1..1763aa91a 100755
--- a/docker/context/fish_run_tests.sh
+++ b/docker/context/fish_run_tests.sh
@@ -13,6 +13,11 @@ then
 fi
 
 ninja && ninja fish_run_tests
+RES=$?
 
 # Drop the user into a shell if FISH_RUN_SHELL_AFTER_TESTS is set.
-test -n "$FISH_RUN_SHELL_AFTER_TESTS" && exec bash -i
+if test -n "$FISH_RUN_SHELL_AFTER_TESTS"; then
+    bash -i
+fi
+
+exit $RES