diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
index 6156aab9a57..22c2e300182 100644
--- a/.buildkite/scripts/common.sh
+++ b/.buildkite/scripts/common.sh
@@ -58,7 +58,9 @@ mage() {
     fi
     pushd "$WORKSPACE"
     command "mage" "$@"
+    ACTUAL_EXIT_CODE=$?
     popd
+    return $ACTUAL_EXIT_CODE
 }
 
 # Wrapper function for executing go
@@ -78,7 +80,9 @@ go(){
     fi
     pushd "$WORKSPACE"
     command go "$@"
+    ACTUAL_EXIT_CODE=$?
     popd
+    return $ACTUAL_EXIT_CODE
 }
 
 google_cloud_auth() {