diff --git a/buildbot/dependency.conf b/buildbot/dependency.conf
index 17b6d9ab767f8..109c3859d5361 100644
--- a/buildbot/dependency.conf
+++ b/buildbot/dependency.conf
@@ -7,8 +7,8 @@ ocl_cpu_rt_ver_win=2020.11.8.0.27
 # https://github.com/intel/compute-runtime/releases/tag/20.35.17767
 ocl_gpu_rt_ver=20.35.17767
 # Same GPU driver supports Level Zero and OpenCL:
-# https://downloadmirror.intel.com/29817/a08/igfx_win10_100.8778.zip
-ocl_gpu_rt_ver_win=27.20.100.8778
+# https://downloadmirror.intel.com/29817/a08/igfx_win10_100.8673.zip
+ocl_gpu_rt_ver_win=27.20.100.8673
 intel_sycl_ver=build
 # https://github.com/oneapi-src/oneTBB/releases/download/v2021.1-beta08/oneapi-tbb-2021.1-beta08-lin.tgz
 tbb_ver=2021.1.9.636
@@ -25,7 +25,7 @@ fpga_ver_win=20200811_000006
 cpu_driver_lin=2020.11.8.0.27
 cpu_driver_win=2020.11.8.0.27
 gpu_driver_lin=20.35.17767
-gpu_driver_win=27.20.100.8778
+gpu_driver_win=27.20.100.8673
 fpga_driver_lin=2020.11.8.0.27
 fpga_driver_win=2020.11.8.0.27
 # NVidia CUDA driver
diff --git a/sycl/test/basic_tests/buffer/buffer_full_copy.cpp b/sycl/test/basic_tests/buffer/buffer_full_copy.cpp
index 4c32a8b2c6b1e..dd6bc4ed5ec61 100644
--- a/sycl/test/basic_tests/buffer/buffer_full_copy.cpp
+++ b/sycl/test/basic_tests/buffer/buffer_full_copy.cpp
@@ -1,3 +1,4 @@
+// XFAIL: windows && level_zero
 // RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include
 // RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple  %s -o %t2.out
diff --git a/sycl/test/hier_par/hier_par_wgscope.cpp b/sycl/test/hier_par/hier_par_wgscope.cpp
index 2167f3bfba8b4..698ac60bf8489 100644
--- a/sycl/test/hier_par/hier_par_wgscope.cpp
+++ b/sycl/test/hier_par/hier_par_wgscope.cpp
@@ -1,6 +1,6 @@
 // TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
 // See https://github.com/intel/llvm/issues/2264 for more details.
-// XFAIL: gpu && (level_zero || opencl) && linux
+// XFAIL: gpu && (level_zero || opencl)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: env SYCL_DEVICE_TYPE=HOST %t.out
diff --git a/sycl/test/sub_group/generic_reduce.cpp b/sycl/test/sub_group/generic_reduce.cpp
index 3ef504343af48..676c6b284a394 100644
--- a/sycl/test/sub_group/generic_reduce.cpp
+++ b/sycl/test/sub_group/generic_reduce.cpp
@@ -1,6 +1,6 @@
 // TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
 // See https://github.com/intel/llvm/issues/2264 for more details.
-// XFAIL: gpu && linux
+// XFAIL: gpu
 
 // UNSUPPORTED: cuda
 // CUDA compilation and runtime do not yet support sub-groups.
diff --git a/sycl/test/sub_group/load_store.cpp b/sycl/test/sub_group/load_store.cpp
index 8a598b82525d9..f6c96a02324d1 100644
--- a/sycl/test/sub_group/load_store.cpp
+++ b/sycl/test/sub_group/load_store.cpp
@@ -1,6 +1,6 @@
 // TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
 // See https://github.com/intel/llvm/issues/2264 for more details.
-// XFAIL: gpu && linux
+// XFAIL: gpu
 
 // UNSUPPORTED: cuda || cpu
 // CUDA compilation and runtime do not yet support sub-groups.