diff --git a/buildbot/dependency.conf b/buildbot/dependency.conf
index 8ab0521177e5f..c464b4f7bb0bc 100644
--- a/buildbot/dependency.conf
+++ b/buildbot/dependency.conf
@@ -1,31 +1,33 @@
 [VERSIONS]
-# https://github.com/intel/llvm/releases/download/2020-WW20/oclcpuexp-2020.10.6.0.4_rel.tar.gz
-ocl_cpu_rt_ver=2020.10.6.0.04
-# https://github.com/intel/llvm/releases/download/2020-WW20/win-oclcpuexp-2020.10.6.0.4_rel.zip
-ocl_cpu_rt_ver_win=2020.10.6.0.04
+# https://github.com/intel/llvm/releases/download/2020-WW31/oclcpuexp-2020.10.7.0.15_rel.tar.gz
+ocl_cpu_rt_ver=2020.10.7.0.15
+# https://github.com/intel/llvm/releases/download/2020-WW31/win-oclcpuexp-2020.10.7.0.15_rel.zip
+ocl_cpu_rt_ver_win=2020.10.7.0.15
 # Same GPU driver supports Level Zero and OpenCL:
-# https://github.com/intel/compute-runtime/releases/tag/20.21.16886
-ocl_gpu_rt_ver=20.21.16886
+# https://github.com/intel/compute-runtime/releases/tag/20.25.17111
+ocl_gpu_rt_ver=20.29.17408
 # Same GPU driver supports Level Zero and OpenCL:
-# https://downloadmirror.intel.com/29616/a08/igfx_win10_100.8280.zip
-ocl_gpu_rt_ver_win=27.20.100.8280
+# https://downloadmirror.intel.com/29674/a08/igfx_win10_100.8336.zip
+ocl_gpu_rt_ver_win=27.20.100.8336
 intel_sycl_ver=build
 # https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-lin.tgz
-tbb_ver=20200121_111047
+tbb_ver=2021.1.8.515
 # https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-win.zip
-tbb_ver_win=20200124_000000
-# TODO: provide URL for Linux OpenCL emulator of FPGA device
-fpga_ver=20200216_000000
-# TODO: provide URL for Windows OpenCL emulator of FPGA device
-fpga_ver_win=20200216_000000
+tbb_ver_win=2021.1.8.514
+# https://github.com/intel/llvm/releases/download/2020-WW31/fpgaemu-2020.10.7.0.15_rel.tar.gz
+ocl_fpga_emu_ver=2020.10.7.0.15
+# https://github.com/intel/llvm/releases/download/2020-WW31/win-fpgaemu-2020.10.7.0.15_rel.zip
+ocl_fpga_emu_ver_win=2020.10.7.0.15
+fpga_ver=20200701_000002
+fpga_ver_win=20200701_000002
 
 [DRIVER VERSIONS]
-cpu_driver_lin=2020.10.6.0.04
-cpu_driver_win=2020.10.6.0.04
-gpu_driver_lin=20.21.16886
-gpu_driver_win=27.20.100.8280
-fpga_driver_lin=2020.9.2.0
-fpga_driver_win=2020.9.2.0
+cpu_driver_lin=2020.10.7.0.15
+cpu_driver_win=2020.10.7.0.15
+gpu_driver_lin=20.29.17408
+gpu_driver_win=27.20.100.8336
+fpga_driver_lin=2020.10.7.0.15
+fpga_driver_win=2020.10.7.0.15
 # NVidia CUDA driver
-# http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-drivers_450.36.06-1_amd64.deb
-nvidia_gpu_driver_lin=450.36.06
+# TODO provide URL for CUDA driver
+nvidia_gpu_driver_lin=435.21
diff --git a/sycl/test/hier_par/hier_par_wgscope_O0.cpp b/sycl/test/hier_par/hier_par_wgscope_O0.cpp
index 8a4502202e34a..03370878c7cda 100644
--- a/sycl/test/hier_par/hier_par_wgscope_O0.cpp
+++ b/sycl/test/hier_par/hier_par_wgscope_O0.cpp
@@ -13,7 +13,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// XFAIL: accelerator || (system-windows && cpu)
+// UNSUPPORTED: accelerator || (system-windows && cpu)
 
 // This test checks correctness of hierarchical kernel execution when there is
 // code and data in the work group scope, and when the test is compiled with
diff --git a/sycl/test/regression/static-buffer-dtor.cpp b/sycl/test/regression/static-buffer-dtor.cpp
index c541c180e7d73..2c20dce33f281 100644
--- a/sycl/test/regression/static-buffer-dtor.cpp
+++ b/sycl/test/regression/static-buffer-dtor.cpp
@@ -13,8 +13,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
-//
-// XFAIL: linux && level_zero
 
 #include <CL/sycl.hpp>
 
diff --git a/sycl/test/sub_group/generic-shuffle.cpp b/sycl/test/sub_group/generic-shuffle.cpp
index d2d7e191dfa32..78d1d439d1301 100644
--- a/sycl/test/sub_group/generic-shuffle.cpp
+++ b/sycl/test/sub_group/generic-shuffle.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: cuda
+// UNSUPPORTED: cuda || cpu
 // CUDA compilation and runtime do not yet support sub-groups.
 //
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out