diff --git a/test/Feature/HLSLLib/isnan.16.test b/test/Feature/HLSLLib/isnan.16.test
new file mode 100644
index 000000000..e3e6ce7f5
--- /dev/null
+++ b/test/Feature/HLSLLib/isnan.16.test
@@ -0,0 +1,68 @@
+#--- source.hlsl
+
+StructuredBuffer<half4> In : register(t0);
+RWStructuredBuffer<bool4> Out : register(u1);
+
+[numthreads(1,1,1)]
+void main() {
+  Out[0] = isnan(In[0]);
+  bool4 Tmp = {isnan(In[0].xyz), isnan(In[0].w)};
+  Out[1] = Tmp;
+  Out[2].xy = isnan(In[0].xy);
+}
+
+//--- pipeline.yaml
+
+---
+Shaders:
+  - Stage: Compute
+    Entry: main
+    DispatchSize: [1, 1, 1]
+Buffers:
+  - Name: In
+    Format: Float16
+    Stride: 8
+    Data: [0x7c00, 0xfc00, 0x3c00, 0x7e00] # Inf, -Inf, 1, Nan
+  - Name: Out
+    Format: Bool
+    Stride: 16
+    ZeroInitSize: 48
+  - Name: ExpectedOut # The result we expect
+    Format: Bool
+    Stride: 16
+    Data: [0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1]
+Results:
+  - Result: Test1
+    Rule: BufferExact
+    Actual: Out
+    Expected: ExpectedOut
+DescriptorSets:
+  - Resources:
+    - Name: In
+      Kind: StructuredBuffer
+      DirectXBinding:
+        Register: 0
+        Space: 0
+      VulkanBinding:
+        Binding: 0
+    - Name: Out
+      Kind: RWStructuredBuffer
+      DirectXBinding:
+        Register: 1
+        Space: 0
+      VulkanBinding:
+        Binding: 1
+...
+#--- end
+
+# https://github.com/llvm/llvm-project/issues/145571
+# XFAIL: Clang && DirectX-NV
+
+# A bug in the Metal Shader Converter caused it to mis-translate this operation.
+# Version 3 fixes this issue.
+# UNSUPPORTED: Clang-Metal && !metal-shaderconverter-3.0.0-or-later
+
+# REQUIRES: Half
+# RUN: split-file %s %t
+# RUN: %dxc_target -enable-16bit-types -T cs_6_5 -Fo %t.o %t/source.hlsl
+# RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/HLSLLib/isnan.32.test b/test/Feature/HLSLLib/isnan.32.test
new file mode 100644
index 000000000..f9bd4c2af
--- /dev/null
+++ b/test/Feature/HLSLLib/isnan.32.test
@@ -0,0 +1,63 @@
+#--- source.hlsl
+
+StructuredBuffer<float4> In : register(t0);
+RWStructuredBuffer<bool4> Out : register(u1);
+
+[numthreads(1,1,1)]
+void main() {
+  Out[0] = isnan(In[0]);
+  bool4 Tmp = {isnan(In[0].xyz), isnan(In[0].w)};
+  Out[1] = Tmp;
+  Out[2].xy = isnan(In[0].xy);
+}
+
+//--- pipeline.yaml
+
+---
+Shaders:
+  - Stage: Compute
+    Entry: main
+    DispatchSize: [1, 1, 1]
+Buffers:
+  - Name: In
+    Format: Float32
+    Stride: 16
+    Data: [inf, -inf, 1.0, nan] # Inf, -Inf, 1, Nan
+  - Name: Out
+    Format: Bool
+    Stride: 16
+    ZeroInitSize: 48
+  - Name: ExpectedOut # The result we expect
+    Format: Bool
+    Stride: 16
+    Data: [0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1]
+Results:
+  - Result: Test1
+    Rule: BufferExact
+    Actual: Out
+    Expected: ExpectedOut
+DescriptorSets:
+  - Resources:
+    - Name: In
+      Kind: StructuredBuffer
+      DirectXBinding:
+        Register: 0
+        Space: 0
+      VulkanBinding:
+        Binding: 0
+    - Name: Out
+      Kind: RWStructuredBuffer
+      DirectXBinding:
+        Register: 1
+        Space: 0
+      VulkanBinding:
+        Binding: 1
+...
+#--- end
+
+# llvm/llvm-project#141089
+# XFAIL: Clang-Vulkan
+
+# RUN: split-file %s %t
+# RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
+# RUN: %offloader %t/pipeline.yaml %t.o