diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index c54588de..980d45fe 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         version: ['1.10', '1.12']
-        os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-15, macOS-15-intel, windows-2025]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-15, macOS-15-intel, windows-2022]
         arch: [x64, arm64]
         pocl: [jll, local]
         memory_backend: [usm, svm, buffer]
@@ -31,7 +31,7 @@ jobs:
           # unsupported combinations
           - os: ubuntu-24.04
             arch: arm64
-          - os: windows-2025
+          - os: windows-2022
             arch: arm64
           - os: ubuntu-24.04-arm
             arch: x64
@@ -45,7 +45,7 @@ jobs:
             pocl: local
           - os: macOS-15
             pocl: local
-          - os: windows-2025
+          - os: windows-2022
             pocl: local
           # Remove these exclusions once macOS CI hangs are fixed
           - os: macOS-15-intel
diff --git a/lib/cl/kernel.jl b/lib/cl/kernel.jl
index d0243130..ded41be1 100644
--- a/lib/cl/kernel.jl
+++ b/lib/cl/kernel.jl
@@ -302,7 +302,8 @@ function call(
         if !isempty(bda_pointers)
             clSetKernelExecInfo(k, CL_KERNEL_EXEC_INFO_DEVICE_PTRS_EXT, sizeof(bda_pointers), bda_pointers)
         end
-        if !isempty(usm_pointers)
+        # XXX: Causes crashes on Windows
+        if !isempty(usm_pointers) && !Sys.iswindows()
             clSetKernelExecInfo(k, CL_KERNEL_EXEC_INFO_USM_PTRS_INTEL, sizeof(usm_pointers), usm_pointers)
         end
     end
diff --git a/test/Project.toml b/test/Project.toml
index 57ae7ff9..0f85866e 100644
--- a/test/Project.toml
+++ b/test/Project.toml
@@ -8,6 +8,7 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
diff --git a/test/intrinsics.jl b/test/intrinsics.jl
index 69150e5e..ebbf3aea 100644
--- a/test/intrinsics.jl
+++ b/test/intrinsics.jl
@@ -13,7 +13,8 @@ end
 
 const float_types = filter(x -> x <: Base.IEEEFloat, GPUArraysTestSuite.supported_eltypes(CLArray))
 const ispocl = cl.platform().name == "Portable Computing Language"
-const simd_ns = [2, 3, 4, 8, 16]
+# XXX: Why does pocl on windows not support vectors of size 2, 8, 16?
+const simd_ns = (Sys.iswindows() && ispocl) ? [3, 4] : [2, 3, 4, 8, 16]
 
 @testset "intrinsics" begin
 
diff --git a/test/runtests.jl b/test/runtests.jl
index 6fd437f2..1575f0bf 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,3 +1,6 @@
+using Pkg
+Pkg.add(url="https://github.com/JuliaGPU/GPUArrays.jl", rev="master")
+
 using Distributed
 using Dates
 import REPL