diff --git a/tests/ResourceMaterializationTests.cpp b/tests/ResourceMaterializationTests.cpp
index 5106c50a9..890a2ddfb 100644
--- a/tests/ResourceMaterializationTests.cpp
+++ b/tests/ResourceMaterializationTests.cpp
@@ -1256,7 +1256,7 @@ void TestIndirectImageSamplerClasses(bool mixed) {
   DescriptorSource root;
   root.dword_count = 8;
   root.dwords.fill(Value(0u));
-  root.indirect_descriptor.emplace().sources = {0, 1, 0};
+  root.indirect_descriptor.emplace(DescriptorSource::IndirectDescriptor{}).sources = {0, 1, 0};
   program.info.images.resize(1);
   program.info.images[0].source = static_cast<uint32_t>(program.descriptor_sources.size());
   program.descriptor_sources.push_back(root);
diff --git a/tests/ShaderRecompilerComputeTests.cpp b/tests/ShaderRecompilerComputeTests.cpp
index 84fd0f40c..c640a650d 100644
--- a/tests/ShaderRecompilerComputeTests.cpp
+++ b/tests/ShaderRecompilerComputeTests.cpp
@@ -5374,14 +5374,14 @@ public:
     }
     auto &cache = context.GetBufferCache();
     // Exercise the ordinary ring before requesting the captured 576-MiB footprint.
-    const auto small = cache.ObtainBufferForImage(base, page);
+    const auto ring_slice = cache.ObtainBufferForImage(base, page);
     auto readback = CreateHostBuffer(name, 8u * sizeof(u32),
         vk::BufferUsageFlagBits::eTransferDst, {});
-    const vk::BufferCopy small_copy{small.second, 0, sizeof(u32)};
-    scheduler.Current().Handle().copyBuffer(small.first->Handle(), readback.buffer, 1, &small_copy);
+    const vk::BufferCopy small_copy{ring_slice.second, 0, sizeof(u32)};
+    scheduler.Current().Handle().copyBuffer(ring_slice.first->Handle(), readback.buffer, 1, &small_copy);
     const auto large = cache.ObtainBufferForImage(base, size);
-    Require(name, "temporary image source", large.first != nullptr && large.first != small.first &&
-        large.first->Size() == size && small.first->Size() == ring_size,
+    Require(name, "temporary image source", large.first != nullptr && large.first != ring_slice.first &&
+        large.first->Size() == size && ring_slice.first->Size() == ring_size,
         "oversized image upload resized the ring or truncated its source");
     constexpr std::array<uint64_t, 5> probes{0, page, ring_size - 4u, ring_size, size - 4u};
     std::array<vk::BufferCopy, probes.size()> copies{};