diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 5f78ea5e81..95f8f7b08f 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -42,7 +42,7 @@ jobs:
             lib/libgeos_c.dylib
           if-no-files-found: error
 
-  build:
+  build-macos:
     needs: build-arch
     runs-on: macos-14
     steps:
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
new file mode 100644
index 0000000000..6e573852c9
--- /dev/null
+++ b/.github/workflows/test-macos.yml
@@ -0,0 +1,23 @@
+name: test-macos
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test-macos:
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          ref: ${{ github.event.pull_request.head.sha }} # to match buildomat behavior
+      - name: Toolchain setup
+        run: |
+          set -o xtrace
+          source .github/workflows/macos-setup.sh
+          echo "PATH=$PATH" >>"$GITHUB_ENV"
+      - name: Test
+        run: gmake -j`sysctl -n hw.ncpu` test
+        env:
+          BROWSERSLIST_IGNORE_OLD_DATA: 1
+
diff --git a/Makefile b/Makefile
index e2afbfb716..1167cb9b87 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ SUBTESTS :=
 LINTTIMEOUT := 30m
 
 ## Test timeout to use for regular tests.
-TESTTIMEOUT := 60m
+TESTTIMEOUT := 90m
 
 ## Test timeout to use for race tests.
 RACETIMEOUT := 45m
diff --git a/README.md b/README.md
index 6c9c989d43..1d705596d6 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ This is Oxide's long-term maintenance branch/fork of [CockroachDB 22.1](https://
 
 Oxide uses CockroachDB for control plane data storage on the Oxide Cloud Computer, which uses [illumos](https://illumos.org) (specifically [Helios](https://github.com/oxidecomputer/helios)) as the underlying operating system. We launched our product with CockroachDB 22.1. After Cockroach Labs' announcement that they will change to a strictly proprietary (source-available) model, we made the decision to continue self-supporting on this BSL-licensed version for the foreseeable future. For more context, see [RFD 110](https://rfd.shared.oxide.computer/rfd/110) and [RFD 508](https://rfd.shared.oxide.computer/rfd/508).
 
-The primary goal of this branch is to keep the wheels of building and testing CockroachDB rolling smoothly to enable our ability to self-support. Our product runs illumos, but we also support development of our product on Linux and macOS, so it's important to us that our bug fixes that go into the illumos build also end up on developer machines too. Currently we have builds for illumos, Linux, and macOS; and run the test suite on illumos and Linux.
+The primary goal of this branch is to keep the wheels of building and testing CockroachDB rolling smoothly to enable our ability to self-support. Our product runs illumos, but we also support development of our product on Linux and macOS, so it's important to us that our bug fixes that go into the illumos build also end up on developer machines too. Thus we have builds for and run tests on illumos, Linux, and macOS.
 
 You're welcome to use this branch under [the same terms we are](./licenses/BSL.txt), but note that we're unable to provide any support outside the context of its use in our product.