diff --git a/test/Basic/matrix_scalar_arithmetic.test b/test/Basic/matrix_scalar_arithmetic.test
index c80781bc..507a8766 100644
--- a/test/Basic/matrix_scalar_arithmetic.test
+++ b/test/Basic/matrix_scalar_arithmetic.test
@@ -83,6 +83,9 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug https://github.com/llvm/offload-test-suite/issues/538
+# XFAIL: Clang && Vulkan
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s
diff --git a/test/Basic/matrix_scalar_constructor.test b/test/Basic/matrix_scalar_constructor.test
index 68c6adf5..d0aacf40 100644
--- a/test/Basic/matrix_scalar_constructor.test
+++ b/test/Basic/matrix_scalar_constructor.test
@@ -56,6 +56,9 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug https://github.com/llvm/offload-test-suite/issues/538
+# XFAIL: Clang && Vulkan
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/WaveOps/WaveReadLaneAt.16.test b/test/WaveOps/WaveReadLaneAt.16.test
index 09bea061..868aa134 100644
--- a/test/WaveOps/WaveReadLaneAt.16.test
+++ b/test/WaveOps/WaveReadLaneAt.16.test
@@ -145,6 +145,9 @@ DescriptorSets:
 # Bug tracked by https://github.com/llvm/offload-test-suite/issues/396
 # XFAIL: DirectX && WARP
 
+# Bug https://github.com/llvm/offload-test-suite/issues/532
+# XFAIL: DirectX && QC
+
 # REQUIRES: Half, Int16
 
 # RUN: split-file %s %t
diff --git a/test/WaveOps/WaveReadLaneAt.Float.64.test b/test/WaveOps/WaveReadLaneAt.Float.64.test
index 3b50cd12..52bebd54 100644
--- a/test/WaveOps/WaveReadLaneAt.Float.64.test
+++ b/test/WaveOps/WaveReadLaneAt.Float.64.test
@@ -62,6 +62,9 @@ DescriptorSets:
 # Bug https://github.com/llvm/llvm-project/issues/170241
 # XFAIL: Clang && Vulkan
 
+# Bug https://github.com/llvm/offload-test-suite/issues/533
+# XFAIL: DirectX && AMD
+
 # REQUIRES: Double
 
 # RUN: split-file %s %t
diff --git a/test/WaveOps/WaveReadLaneAt.Int.64.test b/test/WaveOps/WaveReadLaneAt.Int.64.test
index ea16747e..5c0e4c92 100644
--- a/test/WaveOps/WaveReadLaneAt.Int.64.test
+++ b/test/WaveOps/WaveReadLaneAt.Int.64.test
@@ -103,6 +103,9 @@ DescriptorSets:
 # Bug https://github.com/llvm/llvm-project/issues/170241
 # XFAIL: Clang && Vulkan
 
+# Bug https://github.com/llvm/offload-test-suite/issues/533
+# XFAIL: DirectX && AMD
+
 # REQUIRES: Int64
 
 # RUN: split-file %s %t