diff --git a/test/Basic/Matrix/matrix_elementwise_vector_cast.test b/test/Basic/Matrix/matrix_elementwise_vector_cast.test
index d1f0d124..23223d29 100644
--- a/test/Basic/Matrix/matrix_elementwise_vector_cast.test
+++ b/test/Basic/Matrix/matrix_elementwise_vector_cast.test
@@ -73,8 +73,8 @@ DescriptorSets:
 ...
 #--- end
 
-# Unimplemented: https://github.com/llvm/llvm-project/issues/170538
-# XFAIL: Vulkan && Clang
+# Bug https://github.com/llvm/offload-test-suite/issues/599
+# XFAIL: Intel && Vulkan && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_trunc_cast.test b/test/Basic/Matrix/matrix_trunc_cast.test
index fcefbc1b..b3c958e1 100644
--- a/test/Basic/Matrix/matrix_trunc_cast.test
+++ b/test/Basic/Matrix/matrix_trunc_cast.test
@@ -56,8 +56,8 @@ DescriptorSets:
 ...
 #--- end
 
-# Unimplemented: https://github.com/llvm/llvm-project/issues/170538
-# XFAIL: Vulkan && Clang
+# Bug https://github.com/llvm/offload-test-suite/issues/599
+# XFAIL: Intel && Vulkan && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl