diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e5180b037a916..5492a2354ede6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -445,7 +445,10 @@ jobs:
             # C: drive is extremely slow: https://github.com/actions/runner-images/issues/8755
             mkdir -p "R:/temp/embedded-pg"
             go run scripts/embedded-pg/main.go -path "R:/temp/embedded-pg"
-            DB=ci gotestsum --format standard-quiet -- -v -short -count=1 ./...
+            # Reduce test parallelism, mirroring what we do for race tests.
+            # We'd been encountering issues with timing related flakes, and
+            # this seems to help.
+            DB=ci gotestsum --format standard-quiet -- -v -short -count=1 -parallel 4 -p 4 ./...
           else
             go run scripts/embedded-pg/main.go
             DB=ci gotestsum --format standard-quiet -- -v -short -count=1 ./...
diff --git a/testutil/duration.go b/testutil/duration.go
index 44ae418eba74f..a8c35030cdea2 100644
--- a/testutil/duration.go
+++ b/testutil/duration.go
@@ -1,5 +1,3 @@
-//go:build !windows
-
 package testutil
 
 import (
diff --git a/testutil/duration_windows.go b/testutil/duration_windows.go
deleted file mode 100644
index d363dae2ba596..0000000000000
--- a/testutil/duration_windows.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package testutil
-
-import "time"
-
-// Constants for timing out operations, usable for creating contexts
-// that timeout or in require.Eventually.
-//
-// Windows durations are adjusted for slow CI workers.
-const (
-	WaitShort     = 30 * time.Second
-	WaitMedium    = 40 * time.Second
-	WaitLong      = 70 * time.Second
-	WaitSuperLong = 240 * time.Second
-)
-
-// Constants for delaying repeated operations, e.g. in
-// require.Eventually.
-//
-// Windows durations are adjusted for slow CI workers.
-const (
-	IntervalFast   = 100 * time.Millisecond
-	IntervalMedium = 1000 * time.Millisecond
-	IntervalSlow   = 4 * time.Second
-)