diff --git a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
index 68c2ed7c..5eeb981b 100644
--- a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
@@ -109,8 +109,11 @@ protected:
           config->set_enable_drive_events(true);
           config->set_event_level(event_level::trace);
           config->set_s3_config(src_cfg.get_s3_config());
-          config->set_enable_remote_mount(true);
-          config->set_remote_api_port(30000U);
+
+          auto r_cfg = config->get_remote_mount();
+          r_cfg.enable = true;
+          r_cfg.api_port = 30000U;
+          config->set_remote_mount(r_cfg);
         }
 
         drive_args = std::vector<std::string>({
@@ -152,8 +155,11 @@ protected:
           config->set_event_level(event_level::trace);
           config->set_host_config(src_cfg.get_host_config());
           config->set_sia_config(src_cfg.get_sia_config());
-          config->set_enable_remote_mount(true);
-          config->set_remote_api_port(30000U);
+
+          auto r_cfg = config->get_remote_mount();
+          r_cfg.enable = true;
+          r_cfg.api_port = 30000U;
+          config->set_remote_mount(r_cfg);
         }
 
         drive_args = std::vector<std::string>({
diff --git a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
index b9159b3c..6a910660 100644
--- a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
@@ -99,8 +99,11 @@ protected:
           config->set_enable_drive_events(true);
           config->set_event_level(event_level::trace);
           config->set_s3_config(src_cfg.get_s3_config());
-          config->set_enable_remote_mount(true);
-          config->set_remote_api_port(30000U);
+
+          auto r_cfg = config->get_remote_mount();
+          r_cfg.enable = true;
+          r_cfg.api_port = 30000U;
+          config->set_remote_mount(r_cfg);
         }
 
         drive_args = std::vector<std::string>({
@@ -138,8 +141,11 @@ protected:
           config->set_event_level(event_level::trace);
           config->set_host_config(src_cfg.get_host_config());
           config->set_sia_config(src_cfg.get_sia_config());
-          config->set_enable_remote_mount(true);
-          config->set_remote_api_port(30000U);
+
+          auto r_cfg = config->get_remote_mount();
+          r_cfg.enable = true;
+          r_cfg.api_port = 30000U;
+          config->set_remote_mount(r_cfg);
         }
 
         drive_args = std::vector<std::string>({