diff --git a/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test b/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
index dbf75ff71..ae47287c3 100644
--- a/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
+++ b/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
@@ -52,7 +52,7 @@ DescriptorSets:
 
 
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -HV 202x -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/dot.32.test b/test/Feature/HLSLLib/dot.32.test
index 9ed7caf42..f45431448 100644
--- a/test/Feature/HLSLLib/dot.32.test
+++ b/test/Feature/HLSLLib/dot.32.test
@@ -190,7 +190,7 @@ DescriptorSets:
 #--- end
 
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # RUN: split-file %s %t
 # RUN: %dxc_target  -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/dot.fp16.test b/test/Feature/HLSLLib/dot.fp16.test
index d060778ee..aa21c6f28 100644
--- a/test/Feature/HLSLLib/dot.fp16.test
+++ b/test/Feature/HLSLLib/dot.fp16.test
@@ -48,8 +48,8 @@ Buffers:
     # [ 8.20125, 8.20125, 0.35125, 0.35125, 5.57625, 5.57625, -17.61125, -17.61125 ]
 Results:
   - Result: Test1
-    Rule: BufferFloatEpsilon
-    Epsilon: 0.008
+    Rule: BufferFloatULP
+    ULPT: 30
     Actual: Out
     Expected: ExpectedOut
 DescriptorSets:
@@ -77,10 +77,14 @@ DescriptorSets:
         Binding: 2
 #--- end
 
+# DXC is producing a compile-time value at a significantly higher precision than
+# runtime computed values for case 3 (clang will likely do the same once it
+# learns to constant evaluate `dot`).
+
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # REQUIRES: Half
 # RUN: split-file %s %t
-# RUN: %dxc_target -enable-16bit-types -T cs_6_5 -Fo %t.o %t/source.hlsl
+# RUN: %dxc_target -enable-16bit-types -HV 202x -Gis -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/HLSLLib/dot.fp64.test b/test/Feature/HLSLLib/dot.fp64.test
index 3ed04a335..f55060a58 100644
--- a/test/Feature/HLSLLib/dot.fp64.test
+++ b/test/Feature/HLSLLib/dot.fp64.test
@@ -75,7 +75,7 @@ DescriptorSets:
 #--- end
 
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # REQUIRES: Double
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/fmod.16.test b/test/Feature/HLSLLib/fmod.16.test
index 6555900d9..6b5b5f8d8 100644
--- a/test/Feature/HLSLLib/fmod.16.test
+++ b/test/Feature/HLSLLib/fmod.16.test
@@ -70,7 +70,7 @@ DescriptorSets:
 #--- end
  
 # https://github.com/llvm/llvm-project/issues/149561 
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/fmod.32.test b/test/Feature/HLSLLib/fmod.32.test
index a4403a29a..d64d88983 100644
--- a/test/Feature/HLSLLib/fmod.32.test
+++ b/test/Feature/HLSLLib/fmod.32.test
@@ -67,7 +67,7 @@ DescriptorSets:
 #--- end
 
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -Gis -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/rcp.16.test b/test/Feature/HLSLLib/rcp.16.test
index 14b26a69b..6caa02878 100644
--- a/test/Feature/HLSLLib/rcp.16.test
+++ b/test/Feature/HLSLLib/rcp.16.test
@@ -63,7 +63,7 @@ DescriptorSets:
 #--- end
 
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/rcp.32.test b/test/Feature/HLSLLib/rcp.32.test
index 4d7b2b26b..49fdd7e04 100644
--- a/test/Feature/HLSLLib/rcp.32.test
+++ b/test/Feature/HLSLLib/rcp.32.test
@@ -61,7 +61,7 @@ DescriptorSets:
 #--- end
 
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/rcp.64.test b/test/Feature/HLSLLib/rcp.64.test
index 290d757fd..ae9a67709 100644
--- a/test/Feature/HLSLLib/rcp.64.test
+++ b/test/Feature/HLSLLib/rcp.64.test
@@ -61,7 +61,7 @@ DescriptorSets:
 #--- end
 
 # https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang-Vulkan
+# XFAIL: Clang-Vulkan && !VK_KHR_shader_float_controls2
 
 # REQUIRES: Double
 # RUN: split-file %s %t
diff --git a/test/lit.cfg.py b/test/lit.cfg.py
index 86cf89003..61272c6d3 100644
--- a/test/lit.cfg.py
+++ b/test/lit.cfg.py
@@ -98,6 +98,10 @@ def setDeviceFeatures(config, device, compiler):
         if device["Features"].get("shaderInt64", False):
             config.available_features.add("Int64")
 
+        # Add supported extensions.
+        for Extension in device["Extensions"]:
+            config.available_features.add(Extension["ExtensionName"])
+
 
 if config.offloadtest_test_warp:
     tools.append(