diff --git a/.github/workflows/update-package.yml b/.github/workflows/update-package.yml
index 8a9b6d0a..091b5b49 100644
--- a/.github/workflows/update-package.yml
+++ b/.github/workflows/update-package.yml
@@ -35,6 +35,9 @@ jobs:
               bun update --latest "$package"
             fi
           done
+      - name: Close existing PRs
+        run: |
+          gh pr list --repo ${{ github.repository }} --state open --author "tscircuitbot" --json number,title --jq '.[] | select(.title | startswith("chore:")) | .number' | xargs -I{} gh pr close {} --comment "Closing in favor of a new update PR"
       - name: Create Pull Request
         id: create-pr
         uses: peter-evans/create-pull-request@v5
diff --git a/tests/fixtures/get-test-server.ts b/tests/fixtures/get-test-server.ts
index 912859e7..da223f84 100644
--- a/tests/fixtures/get-test-server.ts
+++ b/tests/fixtures/get-test-server.ts
@@ -2,6 +2,16 @@ import getPort from "get-port"
 import endpoint from "../../endpoint"
 import { afterEach } from "bun:test"
 
+const activeServers = new Set<ReturnType<typeof Bun.serve>>()
+
+afterEach(() => {
+  for (const server of activeServers) {
+    server.stop()
+  }
+
+  activeServers.clear()
+})
+
 export const getTestServer = async () => {
   const port = await getPort()
 
@@ -13,9 +23,7 @@ export const getTestServer = async () => {
     idleTimeout: 20,
   })
 
-  afterEach(() => {
-    server.stop()
-  })
+  activeServers.add(server)
 
   return {
     serverUrl,