diff --git a/support/test/src/test.cpp b/support/test/src/test.cpp
index 8c7cc0b0..d5a1e9e0 100644
--- a/support/test/src/test.cpp
+++ b/support/test/src/test.cpp
@@ -54,8 +54,6 @@ static auto deleter{std::make_unique<file_deleter>()};
 
 namespace repertory::test {
 auto create_random_file(std::size_t size) -> utils::file::i_file & {
-  recur_mutex_lock lock{file_mtx};
-
   auto path = generate_test_file_name("random");
   auto file = utils::file::file::open_or_create_file(path);
   EXPECT_TRUE(*file);
@@ -77,18 +75,19 @@ auto create_random_file(std::size_t size) -> utils::file::i_file & {
     EXPECT_EQ(size, file->size());
   }
 
+  recur_mutex_lock lock{file_mtx};
   generated_files.emplace_back(std::move(file));
   return *dynamic_cast<utils::file::i_file *>(generated_files.back().get());
 }
 
 auto generate_test_directory() -> utils::file::i_directory & {
-  recur_mutex_lock lock{file_mtx};
-
   auto path = utils::path::combine(
       get_test_output_dir(),
       {
           std::string{"test_dir"} + std::to_string(generated_files.size()),
       });
+
+  recur_mutex_lock lock{file_mtx};
   generated_files.emplace_back(std::unique_ptr<utils::file::i_fs_item>(
       new utils::file::directory{path}));
 
@@ -100,13 +99,13 @@ auto generate_test_directory() -> utils::file::i_directory & {
 
 auto generate_test_file_name(std::string_view file_name_no_extension)
     -> std::string {
-  recur_mutex_lock lock{file_mtx};
-
   auto path = utils::path::combine(
       get_test_output_dir(), {
                                  std::string{file_name_no_extension} +
                                      std::to_string(generated_files.size()),
                              });
+
+  recur_mutex_lock lock{file_mtx};
   generated_files.emplace_back(
       std::unique_ptr<utils::file::i_file>(new utils::file::file{path}));
   return generated_files.back()->get_path();