diff --git a/test/Feature/CBuffer/Matrix/LayoutKeyword/matrix_multiply.test b/test/Feature/CBuffer/Matrix/LayoutKeyword/matrix_multiply.test
index 0fa36f9e6..9b6045bd0 100644
--- a/test/Feature/CBuffer/Matrix/LayoutKeyword/matrix_multiply.test
+++ b/test/Feature/CBuffer/Matrix/LayoutKeyword/matrix_multiply.test
@@ -194,8 +194,8 @@ DescriptorSets:
 # Bug https://github.com/microsoft/DirectXShaderCompiler/issues/8473
 # XFAIL: Vulkan && DXC
 
-# Task: https://github.com/llvm/llvm-project/issues/192262
-# XFAIL: Clang
+# Task: https://github.com/llvm/llvm-project/issues/201712
+# XFAIL: Vulkan && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -fvk-use-dx-layout -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/CBuffer/Matrix/LayoutKeyword/single_subscript.test b/test/Feature/CBuffer/Matrix/LayoutKeyword/single_subscript.test
index 36c26b0c4..ce3793a87 100644
--- a/test/Feature/CBuffer/Matrix/LayoutKeyword/single_subscript.test
+++ b/test/Feature/CBuffer/Matrix/LayoutKeyword/single_subscript.test
@@ -103,8 +103,8 @@ DescriptorSets:
 # Bug https://github.com/microsoft/DirectXShaderCompiler/issues/8473
 # XFAIL: Vulkan && DXC
 
-# Task: https://github.com/llvm/llvm-project/issues/192262
-# XFAIL: Clang
+# Task: https://github.com/llvm/llvm-project/issues/201712
+# XFAIL: Vulkan && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -fvk-use-dx-layout -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/CBuffer/Matrix/LayoutKeyword/subscript.test b/test/Feature/CBuffer/Matrix/LayoutKeyword/subscript.test
index c26d69f90..196361ef7 100644
--- a/test/Feature/CBuffer/Matrix/LayoutKeyword/subscript.test
+++ b/test/Feature/CBuffer/Matrix/LayoutKeyword/subscript.test
@@ -101,8 +101,8 @@ DescriptorSets:
 # Bug https://github.com/microsoft/DirectXShaderCompiler/issues/8473
 # XFAIL: Vulkan && DXC
 
-# Task: https://github.com/llvm/llvm-project/issues/192262
-# XFAIL: Clang
+# Task: https://github.com/llvm/llvm-project/issues/201712
+# XFAIL: Vulkan && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -fvk-use-dx-layout -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/CBuffer/Matrix/LayoutKeyword/swizzle.test b/test/Feature/CBuffer/Matrix/LayoutKeyword/swizzle.test
index 5e42dcebd..437d2b717 100644
--- a/test/Feature/CBuffer/Matrix/LayoutKeyword/swizzle.test
+++ b/test/Feature/CBuffer/Matrix/LayoutKeyword/swizzle.test
@@ -183,8 +183,8 @@ DescriptorSets:
 # Bug https://github.com/microsoft/DirectXShaderCompiler/issues/8473
 # XFAIL: Vulkan && DXC
 
-# Task: https://github.com/llvm/llvm-project/issues/192262
-# XFAIL: Clang
+# Task: https://github.com/llvm/llvm-project/issues/201712
+# XFAIL: Vulkan && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -fvk-use-dx-layout -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/CBuffer/Matrix/LayoutKeyword/transpose.test b/test/Feature/CBuffer/Matrix/LayoutKeyword/transpose.test
index c249ebb88..9a5618157 100644
--- a/test/Feature/CBuffer/Matrix/LayoutKeyword/transpose.test
+++ b/test/Feature/CBuffer/Matrix/LayoutKeyword/transpose.test
@@ -180,7 +180,7 @@ DescriptorSets:
 ...
 #--- end
 
-# Task: https://github.com/llvm/llvm-project/issues/192262
+# Task: https://github.com/llvm/wg-hlsl/issues/305
 # XFAIL: Clang
 
 # RUN: split-file %s %t
diff --git a/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test b/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test
index 35271831a..1fb52d090 100644
--- a/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test
@@ -189,9 +189,6 @@ DescriptorSets:
       VulkanBinding:
         Binding: 7
 
-# Unimplemented https://github.com/llvm/llvm-project/issues/185049
-# XFAIL: Clang
-
 # RUN: split-file %s %t
 # RUN: %dxc_target -fvk-use-dx-layout -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o