diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 4d9b8c55a..530f1169b 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -7,7 +7,7 @@ on:
   merge_group:
 
 env:
-  TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.6
+  TWITCH_PUBSUB_SERVER_TAG: v1.0.7
   QT_QPA_PLATFORM: minimal
 
 concurrency:
@@ -54,11 +54,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install boost openssl rapidjson p7zip create-dmg cmake tree docker colima
-
-      - name: Setup Colima
-        run: |
-          colima start
+          brew install boost openssl rapidjson p7zip create-dmg cmake
 
       - name: Build
         run: |
@@ -74,18 +70,27 @@ jobs:
               ..
           make -j"$(sysctl -n hw.logicalcpu)"
 
+      - name: Download and extract Twitch PubSub Server Test
+        run: |
+          mkdir pubsub-server-test
+          curl -L -o pubsub-server.tar.gz "https://github.com/Chatterino/twitch-pubsub-server-test/releases/download/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/server-${{ env.TWITCH_PUBSUB_SERVER_TAG }}-darwin-amd64.tar.gz"
+          tar -xzf pubsub-server.tar.gz -C pubsub-server-test
+          rm pubsub-server.tar.gz
+          cd pubsub-server-test
+          curl -L -o server.crt "https://github.com/Chatterino/twitch-pubsub-server-test/raw/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/cmd/server/server.crt"
+          curl -L -o server.key "https://github.com/Chatterino/twitch-pubsub-server-test/raw/${{ env.TWITCH_PUBSUB_SERVER_TAG }}/cmd/server/server.key"
+          cd ..
+
+      - name: Cargo Install httpbox
+        run: |
+          cargo install --git https://github.com/kevinastone/httpbox --rev 89b971f
+
       - name: Test
         timeout-minutes: 30
         run: |
-          docker pull kennethreitz/httpbin
-          docker pull ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
-          docker run --network=host --detach ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
-          docker run -p 9051:80 --detach kennethreitz/httpbin
+          httpbox --port 9051 &
+          cd ../pubsub-server-test
+          ./server 127.0.0.1:9050 &
+          cd ../build-test
           ctest --repeat until-pass:4 --output-on-failure --exclude-regex ClassicEmoteNameFiltering
         working-directory: build-test
-
-      - name: Post Setup Colima
-        if: always()
-        run: |
-          colima stop
-        working-directory: build-test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ecf7543..8ef6f073a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,7 +85,7 @@
 - Dev: Refactor `IrcMessageHandler`, removing a bunch of clang-tidy warnings & changing its public API. (#4927)
 - Dev: `Details` file properties tab is now populated on Windows. (#4912)
 - Dev: Removed `Outcome` from network requests. (#4959)
-- Dev: Added Tests for Windows and MacOS in CI. (#4970)
+- Dev: Added Tests for Windows and MacOS in CI. (#4970, #5032)
 - Dev: Move `clang-tidy` checker to its own CI job. (#4996)
 - Dev: Refactored the Image Uploader feature. (#4971)
 - Dev: Fixed deadlock and use-after-free in tests. (#4981)