diff --git a/tests/d3d12.c b/tests/d3d12.c
index ccebf510..1222ed05 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -19214,8 +19214,16 @@ static void test_descriptors_visibility(void)
     root_signature_desc.NumStaticSamplers = 2;
     root_signature_desc.pStaticSamplers = sampler_desc;
     hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+    /* llvmpipe (from Mesa 24.0.4) has maxBoundDescriptorSet == 8, which is less than we need. */
+    todo_if(is_llvmpipe_device(device))
     ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
 
+    if (FAILED(hr))
+    {
+        destroy_test_context(&context);
+        return;
+    }
+
     context.pipeline_state = create_pipeline_state(device,
             context.root_signature, context.render_target_desc.Format,
             &vs, &ps, NULL);
@@ -20858,8 +20866,16 @@ static void test_depth_stencil_sampling(void)
     root_signature_desc.NumStaticSamplers = 2;
     root_signature_desc.pStaticSamplers = sampler_desc;
     hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
+    /* llvmpipe (from Mesa 24.0.4) has maxBoundDescriptorSet == 8, which is less than we need. */
+    todo_if(is_llvmpipe_device(device))
     ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
 
+    if (FAILED(hr))
+    {
+        destroy_test_context(&context);
+        return;
+    }
+
     pso_compare = create_pipeline_state(device,
             context.root_signature, context.render_target_desc.Format, NULL, &ps_compare, NULL);
     pso_depth = create_pipeline_state(device,
diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h
index 6c0a4ef1..e2401645 100644
--- a/tests/d3d12_crosstest.h
+++ b/tests/d3d12_crosstest.h
@@ -401,6 +401,11 @@ static inline bool is_mesa_intel_device(ID3D12Device *device)
     return false;
 }
 
+static inline bool is_llvmpipe_device(ID3D12Device *device)
+{
+    return false;
+}
+
 static inline bool is_nvidia_device(ID3D12Device *device)
 {
     return false;
@@ -649,6 +654,14 @@ static inline bool is_mesa_intel_device(ID3D12Device *device)
     return properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR;
 }
 
+static inline bool is_llvmpipe_device(ID3D12Device *device)
+{
+    VkPhysicalDeviceDriverPropertiesKHR properties;
+
+    get_driver_properties(device, &properties);
+    return properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE;
+}
+
 static inline bool is_nvidia_device(ID3D12Device *device)
 {
     VkPhysicalDeviceDriverPropertiesKHR properties;