diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index beca9c6..658216f 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -349,14 +349,14 @@
     fenceInfo.flags = 0;
 
     ASSERT_NO_FATAL_FAILURE(InitState());
-    ASSERT_NO_FATAL_FAILURE(InitViewport());
-    ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
+
+    VkMemoryPropertyFlags reqs = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+    vk_testing::Buffer buffer;
+    buffer.init_as_dst(*m_device, (VkDeviceSize)20, reqs);
 
     VkCommandBufferObj cmdBuffer(m_device);
-    cmdBuffer.AddRenderTarget(m_renderTargets[0]);
-
     BeginCommandBuffer(cmdBuffer);
-    cmdBuffer.ClearAllBuffers(m_clear_color, m_depth_clear_color, m_stencil_clear_color, NULL);
+    cmdBuffer.FillBuffer(buffer.handle(), 0, 4, 0x11111111);
     EndCommandBuffer(cmdBuffer);
 
     testFence.init(*m_device, fenceInfo);
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 9d6d991..761abe5 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1345,6 +1345,11 @@
     }
 }
 
+void VkCommandBufferObj::FillBuffer(VkBuffer buffer, VkDeviceSize offset, VkDeviceSize fill_size, uint32_t data)
+{
+    vkCmdFillBuffer( handle(), buffer, offset, fill_size, data);
+}
+
 void VkCommandBufferObj::PrepareAttachments()
 {
     uint32_t i;
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index e55258d..7cabc34 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -177,6 +177,7 @@
     void BindDynamicColorBlendState(VkDynamicColorBlendState colorBlendState);
     void BindDynamicDepthStencilState(VkDynamicDepthStencilState depthStencilState);
     void EndRenderPass();
+    void FillBuffer(VkBuffer buffer, VkDeviceSize offset, VkDeviceSize fill_size, uint32_t data);
     void Draw(uint32_t firstVertex, uint32_t vertexCount, uint32_t firstInstance, uint32_t instanceCount);
     void DrawIndexed(uint32_t firstIndex, uint32_t indexCount, int32_t vertexOffset, uint32_t firstInstance, uint32_t instanceCount);
     void QueueCommandBuffer();