diff --git a/src/tests/end2end/ComputeSharedMemoryTests.cpp b/src/tests/end2end/ComputeSharedMemoryTests.cpp
index 8ba97696b9..8c5f756451 100644
--- a/src/tests/end2end/ComputeSharedMemoryTests.cpp
+++ b/src/tests/end2end/ComputeSharedMemoryTests.cpp
@@ -26,17 +26,10 @@ class ComputeSharedMemoryTests : public DawnTest {
 };
 
 void ComputeSharedMemoryTests::BasicTest(const char* shader) {
-    auto bgl = utils::MakeBindGroupLayout(
-        device, {
-                    {0, wgpu::ShaderStage::Compute, wgpu::BindingType::StorageBuffer},
-                });
-
     // Set up shader and pipeline
     auto module = utils::CreateShaderModule(device, utils::SingleShaderStage::Compute, shader);
-    auto pl = utils::MakeBasicPipelineLayout(device, &bgl);
 
     wgpu::ComputePipelineDescriptor csDesc;
-    csDesc.layout = pl;
     csDesc.computeStage.module = module;
     csDesc.computeStage.entryPoint = "main";
     wgpu::ComputePipeline pipeline = device.CreateComputePipeline(&csDesc);
@@ -52,7 +45,7 @@ void ComputeSharedMemoryTests::BasicTest(const char* shader) {
     dst.SetSubData(0, sizeof(zero), &zero);
 
     // Set up bind group and issue dispatch
-    wgpu::BindGroup bindGroup = utils::MakeBindGroup(device, bgl,
+    wgpu::BindGroup bindGroup = utils::MakeBindGroup(device, pipeline.GetBindGroupLayout(0),
                                                      {
                                                          {0, dst, 0, sizeof(uint32_t)},
                                                      });