diff --git a/.buildkite/scripts/integration_tests.sh b/.buildkite/scripts/integration_tests.sh
index 2accd2bb7ed..bdf256c20e0 100755
--- a/.buildkite/scripts/integration_tests.sh
+++ b/.buildkite/scripts/integration_tests.sh
@@ -23,9 +23,16 @@ make mage
 # PACKAGE
 DEV=true EXTERNAL=true SNAPSHOT=true PLATFORMS=linux/amd64,linux/arm64 PACKAGES=tar.gz mage package
 
+# Test flags
+GOTEST_FLAGS=""
+if [ "${BUILDKITE_PULL_REQUEST}" != "false" ]; then
+  # this is a PR, let's run a shorter version of integration tests
+  GOTEST_FLAGS="-test.short"
+fi
+
 # Run integration tests
 set +e
-TEST_INTEG_TIMESTAMP=true SNAPSHOT=true mage integration:test
+GOTEST_FLAGS="${GOTEST_FLAGS}" TEST_INTEG_TIMESTAMP=true SNAPSHOT=true mage integration:test
 TESTS_EXIT_STATUS=$?
 set -e