diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index c0e8c44e..e8d529f4 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -1,6 +1,9 @@
 name: Build and test
 on:
   pull_request: { }
+  push:
+    branches:
+      - 'staging'
   workflow_call: { }
 jobs:
   code-formatting:
@@ -108,6 +111,18 @@ jobs:
           path: "*/target/surefire-reports/"
           retention-days: 7
 
+  test-summary:
+    # Used by bors to check all tests, including the unit test matrix.
+    # New test jobs must be added to the `needs` lists!
+    # This name is hard-referenced from bors.toml; remember to update that if this name changes
+    name: Test summary
+    runs-on: ubuntu-latest
+    needs:
+      - code-formatting
+      - build-and-test
+      - build-and-test-testcontainers
+    steps:
+      - run: exit 0
 
   # We need to upload the event file as an artifact in order to support publishing the results of
 # forked repositories (https://github.com/EnricoMi/publish-unit-test-result-action#support-fork-repositories-and-dependabot-branches)
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 00000000..654cd962
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,9 @@
+status = [
+    "Test summary",
+]
+
+required_approvals = 1
+
+delete_merged_branches = true
+
+commit_title = "merge: ${PR_REFS}"
\ No newline at end of file