diff --git a/test/Feature/MaximalReconvergence/loop_peeling.test b/test/Feature/MaximalReconvergence/loop_peeling.test
index 6fa30491..62fed715 100644
--- a/test/Feature/MaximalReconvergence/loop_peeling.test
+++ b/test/Feature/MaximalReconvergence/loop_peeling.test
@@ -1,6 +1,7 @@
 #--- source.hlsl
 RWStructuredBuffer<uint> Out : register(u0);
 
+[WaveSize(8,128)]
 [numthreads(8,1,1)]
 void main(uint3 TID : SV_GroupThreadID) {
     for (uint i = 0; i < 8; i++) {
@@ -36,17 +37,8 @@ DescriptorSets:
 #--- end
 # UNSUPPORTED: Vulkan && !VK_KHR_shader_maximal_reconvergence
 
-# BUG: https://github.com/llvm/llvm-project/issues/164496
-# XFAIL: Clang && Vulkan
-
-# BUG: https://github.com/llvm/offload-test-suite/issues/490
-# XFAIL: WARP && DirectX && Clang
-
-# BUG: https://github.com/llvm/llvm-project/issues/165288
-# XFAIL: !WARP && Clang && (DirectX || Metal)
-
 # RUN: split-file %s %t
-# RUN: %dxc_target -T cs_6_5 -fspv-enable-maximal-reconvergence -Fo %t.o %t/source.hlsl
+# RUN: %dxc_target -T cs_6_8 -fspv-enable-maximal-reconvergence -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s
 
 # CHECK: Name: Out
diff --git a/test/Feature/MaximalReconvergence/subgroup_uniform_control_flow.test b/test/Feature/MaximalReconvergence/subgroup_uniform_control_flow.test
index 3af12646..942c32bc 100644
--- a/test/Feature/MaximalReconvergence/subgroup_uniform_control_flow.test
+++ b/test/Feature/MaximalReconvergence/subgroup_uniform_control_flow.test
@@ -1,6 +1,7 @@
 #--- source.hlsl
 RWStructuredBuffer<uint> Out : register(u0);
 
+[WaveSize(8,128)]
 [numthreads(8,1,1)]
 void main(uint3 TID : SV_GroupThreadID) {
     // First non-uniform branch
@@ -44,14 +45,8 @@ DescriptorSets:
 #--- end
 # UNSUPPORTED: Vulkan && !VK_KHR_shader_maximal_reconvergence
 
-# BUG: https://github.com/llvm/offload-test-suite/issues/490
-# XFAIL: WARP && DirectX
-
-# BUG: https://github.com/llvm/llvm-project/issues/165288
-# XFAIL: !WARP && Clang && (DirectX || Metal)
-
 # RUN: split-file %s %t
-# RUN: %dxc_target -T cs_6_0 -fspv-enable-maximal-reconvergence -Fo %t.o %t/source.hlsl
+# RUN: %dxc_target -T cs_6_8 -fspv-enable-maximal-reconvergence -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s
 
 # CHECK: Name: Out