diff --git a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
index bc98d163..9f7b0723 100644
--- a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
+++ b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
@@ -986,8 +986,6 @@ auto remote_server::winfsp_create(PWSTR file_name, UINT32 create_options,
                                {utils::string::to_utf8(file_name)}))
           .exists());
 
-  std::cout << "ATTRIBUTES: " << std::hex << attributes << std::endl;
-
   attributes |= FILE_FLAG_BACKUP_SEMANTICS;
   if ((create_options & FILE_DIRECTORY_FILE) != 0U) {
     attributes |= FILE_FLAG_POSIX_SEMANTICS;
diff --git a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
index 759fab6a..87a1ba66 100644
--- a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
+++ b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
@@ -129,8 +129,6 @@ auto remote_winfsp_drive::Create(PWSTR file_name, UINT32 create_options,
                                  UINT64 allocation_size, PVOID * /*file_node*/,
                                  PVOID *file_desc, OpenFileInfo *ofi)
     -> NTSTATUS {
-  std::cout << "ATTRIBUTES: " << std::hex << attributes << std::endl;
-
   remote::file_info fi{};
   std::string normalized_name;
   BOOLEAN exists = 0;
diff --git a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
index df62385d..9eace8be 100644
--- a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
@@ -241,7 +241,6 @@ protected:
   }
 
   static void execute_unmount(auto args, auto location) {
-    std::this_thread::sleep_for(30s);
     auto unmounted{false};
 
     auto unmount_cmd =
diff --git a/repertory/repertory_test/src/winfsp_drive_create_attr_test.cpp b/repertory/repertory_test/src/winfsp_drive_create_attr_test.cpp
index 18ed1a3a..2331b980 100644
--- a/repertory/repertory_test/src/winfsp_drive_create_attr_test.cpp
+++ b/repertory/repertory_test/src/winfsp_drive_create_attr_test.cpp
@@ -119,6 +119,8 @@ TYPED_TEST(winfsp_test, cr8_attr_can_create_always_file_with_normal_attribute) {
 
   auto attr = ::GetFileAttributesA(file_path.c_str());
   EXPECT_EQ(FILE_ATTRIBUTE_ARCHIVE, attr);
+
+  EXPECT_TRUE(::DeleteFileA(file_path.c_str()));
 }
 
 TYPED_TEST(winfsp_test, cr8_attr_can_create_file_with_read_only_attribute) {
@@ -136,6 +138,8 @@ TYPED_TEST(winfsp_test, cr8_attr_can_create_file_with_read_only_attribute) {
   EXPECT_EQ(FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_READONLY, attr);
 
   EXPECT_TRUE(::SetFileAttributesA(file_path.c_str(), FILE_ATTRIBUTE_NORMAL));
+
+  EXPECT_TRUE(::DeleteFileA(file_path.c_str()));
 }
 
 // TYPED_TEST(winfsp_test,
@@ -156,6 +160,8 @@ TYPED_TEST(winfsp_test, cr8_attr_can_create_file_with_read_only_attribute) {
 //
 //   EXPECT_TRUE(::SetFileAttributesA(file_path.c_str(),
 //   FILE_ATTRIBUTE_NORMAL));
+//
+//   EXPECT_TRUE(::DeleteFileA(file_path.c_str()));
 // }
 
 TYPED_TEST(winfsp_test, cr8_attr_can_create_always_file_with_hidden_attribute) {