diff --git a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
index e0f49242..d3e08cd2 100644
--- a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
@@ -51,18 +51,52 @@ constexpr auto SLEEP_SECONDS{1.5s};
 } // namespace
 
 namespace repertory {
-struct local_s3 final {
+struct local_s3_no_encryption final {
   static constexpr provider_type type{provider_type::s3};
   static constexpr provider_type type2{provider_type::s3};
   static constexpr std::uint16_t remote_port{41000U};
   static constexpr bool force_legacy_encryption{false};
+  static constexpr std::string encryption_token{""};
 };
 
-struct local_s3_legacy final {
+struct local_s3_encryption final {
+  static constexpr provider_type type{provider_type::s3};
+  static constexpr provider_type type2{provider_type::s3};
+  static constexpr std::uint16_t remote_port{41000U};
+  static constexpr bool force_legacy_encryption{false};
+  static constexpr std::string encryption_token{"encryption_token"};
+};
+
+struct local_s3_legacy_encryption final {
   static constexpr provider_type type{provider_type::s3};
   static constexpr provider_type type2{provider_type::s3};
   static constexpr std::uint16_t remote_port{41000U};
   static constexpr bool force_legacy_encryption{true};
+  static constexpr std::string encryption_token{"encryption_token"};
+};
+
+struct remote_s3_no_encryption final {
+  static constexpr provider_type type{provider_type::remote};
+  static constexpr provider_type type2{provider_type::s3};
+  static constexpr std::uint16_t remote_port{41000U};
+  static constexpr bool force_legacy_encryption{false};
+  static constexpr std::string encryption_token{""};
+};
+
+struct remote_s3_encryption final {
+  static constexpr provider_type type{provider_type::remote};
+  static constexpr provider_type type2{provider_type::s3};
+  static constexpr std::uint16_t remote_port{41000U};
+  static constexpr bool force_legacy_encryption{false};
+  static constexpr std::string encryption_token{"encryption_token"};
+};
+
+struct remote_s3_legacy_encryption final {
+  static constexpr provider_type type{provider_type::remote};
+  static constexpr provider_type type2{provider_type::s3};
+  static constexpr std::uint16_t remote_port{41000U};
+  static constexpr bool force_legacy_encryption{true};
+  static constexpr std::string encryption_token{"encryption_token"};
 };
 
 struct local_sia final {
@@ -70,20 +104,7 @@ struct local_sia final {
   static constexpr provider_type type2{provider_type::sia};
   static constexpr std::uint16_t remote_port{41001U};
   static constexpr bool force_legacy_encryption{false};
-};
-
-struct remote_s3 final {
-  static constexpr provider_type type{provider_type::remote};
-  static constexpr provider_type type2{provider_type::s3};
-  static constexpr std::uint16_t remote_port{41000U};
-  static constexpr bool force_legacy_encryption{false};
-};
-
-struct remote_s3_legacy final {
-  static constexpr provider_type type{provider_type::remote};
-  static constexpr provider_type type2{provider_type::s3};
-  static constexpr std::uint16_t remote_port{41000U};
-  static constexpr bool force_legacy_encryption{true};
+  static constexpr std::string encryption_token{""};
 };
 
 struct remote_sia final {
@@ -91,6 +112,7 @@ struct remote_sia final {
   static constexpr provider_type type2{provider_type::sia};
   static constexpr std::uint16_t remote_port{41001U};
   static constexpr bool force_legacy_encryption{false};
+  static constexpr std::string encryption_token{""};
 };
 
 struct remote_linux_to_winfsp final {
@@ -98,6 +120,7 @@ struct remote_linux_to_winfsp final {
   static constexpr provider_type type2{provider_type::unknown};
   static constexpr std::uint16_t remote_port{41002U};
   static constexpr bool force_legacy_encryption{false};
+  static constexpr std::string encryption_token{""};
 };
 
 template <typename provider_t> class fuse_test : public ::testing::Test {
@@ -145,6 +168,7 @@ protected:
 
           auto cfg = src_cfg.get_s3_config();
           cfg.force_legacy_encryption = provider_t::force_legacy_encryption;
+          cfg.encryption_token = provider_t::encryption_token;
           config->set_enable_drive_events(true);
           config->set_event_level(event_level::trace);
           config->set_s3_config(cfg);
@@ -476,7 +500,9 @@ template <typename provider_t>
 std::string fuse_test<provider_t>::mount_location2;
 
 using fuse_provider_types =
-    ::testing::Types<local_s3, local_s3_legacy, remote_s3, remote_s3_legacy,
+    ::testing::Types<local_s3_no_encryption, local_s3_encryption,
+                     local_s3_legacy_encryption, remote_s3_no_encryption,
+                     remote_s3_encryption, remote_s3_legacy_encryption,
                      local_sia, remote_sia>;
 // using fuse_provider_types =
 //     ::testing::Types<local_s3, remote_s3, local_sia, remote_sia,