diff --git a/src/microsoft/ci/warp-skips.txt b/src/microsoft/ci/warp-skips.txt
index e69de29bb2d..3183cd2bcac 100644
--- a/src/microsoft/ci/warp-skips.txt
+++ b/src/microsoft/ci/warp-skips.txt
@@ -0,0 +1,6 @@
+# Several bugs in WARP's 64-bit wave ops. Fixes incoming
+dEQP-VK.subgroups.*int64_t.*
+dEQP-VK.subgroups.*double.*
+dEQP-VK.subgroups.*i64vec.*
+dEQP-VK.subgroups.*u64vec.*
+dEQP-VK.subgroups.*dvec.*
diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
index ae2e5569925..da955c5ca70 100644
--- a/src/microsoft/vulkan/dzn_device.c
+++ b/src/microsoft/vulkan/dzn_device.c
@@ -1394,8 +1394,8 @@ dzn_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
       .shaderStorageImageArrayDynamicIndexing = true,
       .shaderClipDistance = true,
       .shaderCullDistance = true,
-      .shaderFloat64 = false,
-      .shaderInt64 = false,
+      .shaderFloat64 = pdev->options.DoublePrecisionFloatShaderOps,
+      .shaderInt64 = pdev->options1.Int64ShaderOps,
       .shaderInt16 = pdev->options4.Native16BitShaderOpsSupported,
       .shaderResourceResidency = false,
       .shaderResourceMinLod = false,