diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 94dd2818..ff47eed6 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -48,6 +48,10 @@ steps:
           - "1.10"
           - "1.12"
           - "1.13"
+      adjustments:
+        - with:
+            julia: "1.13"
+          soft_fail: true
     soft_fail:
       - exit_status: 3
 
@@ -101,6 +105,10 @@ steps:
           - "1.10"
           - "1.12"
           - "1.13"
+      adjustments:
+        - with:
+            julia: "1.13"
+          soft_fail: true
     soft_fail:
       - exit_status: 3
 
@@ -154,6 +162,10 @@ steps:
           - "1.10"
           - "1.12"
           - "1.13"
+      adjustments:
+        - with:
+            julia: "1.13"
+          soft_fail: true
     soft_fail:
       - exit_status: 3
 
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 24a2b84e..39e8aab6 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -42,11 +42,6 @@ jobs:
         run: |
           # Run tests in verbose mode
           TEST_ARGS=(--verbose)
-          if [[ ${{ runner.os }} == "macOS" ]]; then
-              # Encourage ParallelTestRunner to use two jobs on macOS, rather
-              # than the single one it'd use by default.
-              TEST_ARGS+=(--jobs=2)
-          fi
           echo "runtest_test_args=${TEST_ARGS[@]}" >> "${GITHUB_ENV}"
       - uses: julia-actions/julia-runtest@v1
         continue-on-error: ${{ matrix.version == 'nightly' }}
diff --git a/test/Project.toml b/test/Project.toml
index 936c644f..8b5927ae 100644
--- a/test/Project.toml
+++ b/test/Project.toml
@@ -5,11 +5,10 @@ JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 ParallelTestRunner = "d3525ed8-44d0-4b2c-a655-542cee43accc"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-ParallelTestRunner = "2"
+ParallelTestRunner = "2.2"
diff --git a/test/runtests.jl b/test/runtests.jl
index 44b3d394..57a2ee22 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -3,7 +3,7 @@ import GPUArrays
 
 include("testsuite.jl")
 
-const init_code = quote
+const init_worker_code = quote
     using Test, JLArrays, SparseArrays
 
     include("testsuite.jl")
@@ -18,6 +18,12 @@ const init_code = quote
     end
 end
 
+const init_code = quote
+    using Test, JLArrays, SparseArrays
+
+    import ..TestSuite
+end
+
 args = parse_args(ARGS)
 
 testsuite = Dict{String, Expr}()
@@ -25,4 +31,4 @@ for AT in (:JLArray, :Array), name in keys(TestSuite.tests)
     testsuite["$(AT)/$name"] = :(TestSuite.tests[$name]($AT))
 end
 
-runtests(GPUArrays, ARGS; init_code, testsuite)
+runtests(GPUArrays, ARGS; init_code, init_worker_code, testsuite)