diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 498d1ac7..a7b15028 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -225,9 +225,6 @@ jobs:
       - name: Simple test (static)
         if: ${{ matrix.compiler-available && matrix.android-abi == '' }}
         run: ${{ env.testbindir }}/simple_test_static${{ env.exe-ext }}
-      - name: Simple test (static)
-        if: ${{ matrix.compiler-available && matrix.android-abi == '' }}
-        run: ${{ env.testbindir }}/simple_test_concurrent_print 1500 ${{ env.exe-ext }}
       - name: Simple test
         if: ${{ matrix.compiler-available && matrix.android-abi == '' }}
         run: ${{ env.testbindir }}/simple_test${{ env.exe-ext }}
diff --git a/src/queue.cpp b/src/queue.cpp
index 408a58ab..1a04b891 100644
--- a/src/queue.cpp
+++ b/src/queue.cpp
@@ -1041,11 +1041,7 @@ cvk_command_kernel::build_batchable_inner(cvk_command_buffer& command_buffer) {
     // Setup printf buffer descriptor if needed
     if (m_kernel->program()->uses_printf()) {
         // Create and initialize the printf buffer
-        auto buffer = get_or_create_printf_buffer();
-        auto err = reset_printf_buffer();
-        if (err != CL_SUCCESS) {
-            return err;
-        }
+        auto buffer = create_printf_buffer();
 
         if (m_kernel->program()->printf_buffer_info().type ==
             module_buffer_type::storage_buffer) {
diff --git a/src/queue.hpp b/src/queue.hpp
index 6351548c..5e393b15 100644
--- a/src/queue.hpp
+++ b/src/queue.hpp
@@ -773,7 +773,7 @@ struct cvk_command_kernel final : public cvk_command_batchable {
         return argvals->memory_objects();
     }
 
-    cvk_buffer* get_or_create_printf_buffer() {
+    cvk_buffer* create_printf_buffer() {
         if (!m_printf_buffer) {
             cl_int status;
             m_printf_buffer = cvk_buffer::create(
@@ -781,17 +781,14 @@ struct cvk_command_kernel final : public cvk_command_batchable {
                 &status);
             CVK_ASSERT(status == CL_SUCCESS);
         }
-        return m_printf_buffer.get();
-    }
 
-    cl_int reset_printf_buffer() {
         if (m_printf_buffer && m_printf_buffer->map_write_only()) {
             memset(m_printf_buffer->host_va(), 0, 4);
             m_printf_buffer->unmap_to_write(0, 4);
-            return CL_SUCCESS;
+        } else {
+            cvk_error_fn("Could not reset printf buffer");
         }
-        cvk_error_fn("Could not reset printf buffer");
-        return CL_OUT_OF_RESOURCES;
+        return m_printf_buffer.get();
     }
 
     cvk_buffer* get_printf_buffer() {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b19246f0..2fba5cb6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -66,7 +66,6 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/config)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/simple)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/simple-from-il-binary)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/simple-from-llvm-ir-binary)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/simple-concurrent)
 endif()
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sha1)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/simple-from-binary)