diff --git a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
index 8c42672d..9cd81d3e 100644
--- a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
@@ -96,12 +96,12 @@ protected:
   static void SetUpTestCase() {
     current_directory = std::filesystem::current_path();
 
-    const auto mount_s3 = [&]() {
+    const auto mount_s3 = [&](bool as_remote) {
       {
         auto test_directory = utils::path::combine(
             test::get_test_output_dir(),
             {
-                "fuse_test",
+                fmt::format("fuse_test_{}", as_remote),
                 app_config::get_provider_name(current_provider),
             });
 
@@ -141,12 +141,12 @@ protected:
       execute_mount(drive_args, mount_location);
     };
 
-    const auto mount_sia = [&]() {
+    const auto mount_sia = [&](bool as_remote) {
       {
         auto test_directory = utils::path::combine(
             test::get_test_output_dir(),
             {
-                "fuse_test",
+                fmt::format("fuse_test_{}", as_remote),
                 app_config::get_provider_name(current_provider),
             });
 
@@ -223,21 +223,21 @@ protected:
 
     switch (provider_t::type) {
     case provider_type::s3: {
-      mount_s3();
+      mount_s3(false);
     } break;
 
     case provider_type::sia: {
-      mount_sia();
+      mount_sia(false);
     } break;
 
     case provider_type::remote: {
       switch (provider_t::type2) {
       case provider_type::s3: {
-        mount_s3();
+        mount_s3(true);
       } break;
 
       case provider_type::sia: {
-        mount_sia();
+        mount_sia(true);
       } break;
 
       case provider_type::unknown:
diff --git a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
index 64aba1af..71914ea9 100644
--- a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
@@ -87,12 +87,12 @@ protected:
 
     mount_location = utils::string::to_lower(std::string{"U:"});
 
-    const auto mount_s3 = [&]() {
+    const auto mount_s3 = [&](bool as_remote) {
       {
         auto test_directory = utils::path::combine(
             test::get_test_output_dir(),
             {
-                "winfsp_test",
+                fmt::format("winfsp_test_{}", as_remote),
                 app_config::get_provider_name(provider_type::s3),
             });
 
@@ -128,12 +128,12 @@ protected:
       execute_mount(drive_args, mount_location);
     };
 
-    const auto mount_sia = [&]() {
+    const auto mount_sia = [&](bool as_remote) {
       {
         auto test_directory = utils::path::combine(
             test::get_test_output_dir(),
             {
-                "winfsp_test",
+                fmt::format("winfsp_test_{}", as_remote),
                 app_config::get_provider_name(provider_type::sia),
             });
 
@@ -206,21 +206,21 @@ protected:
 
     switch (provider_t::type) {
     case provider_type::s3: {
-      mount_s3();
+      mount_s3(false);
     } break;
 
     case provider_type::sia: {
-      mount_sia();
+      mount_sia(false);
     } break;
 
     case provider_type::remote: {
       switch (provider_t::type2) {
       case provider_type::s3: {
-        mount_s3();
+        mount_s3(true);
       } break;
 
       case provider_type::sia: {
-        mount_sia();
+        mount_sia(true);
       } break;
 
       case provider_type::unknown: