diff --git a/repertory/repertory_test/src/providers_test.cpp b/repertory/repertory_test/src/providers_test.cpp
index e02b1a38..05df0551 100644
--- a/repertory/repertory_test/src/providers_test.cpp
+++ b/repertory/repertory_test/src/providers_test.cpp
@@ -1386,13 +1386,13 @@ static void remove_item_meta(i_provider &provider) {
                app_config::get_provider_name(provider.get_provider_type()),
                __FUNCTION__);
 
+  std::string api_path{"/rim_custom_ok.txt"};
   if (provider.get_provider_type() == provider_type::encrypt) {
     EXPECT_EQ(api_error::success,
               provider.remove_item_meta(api_path, "user.custom"));
     return;
   }
 
-  std::string api_path{"/rim_custom_ok.txt"};
   create_file(provider, api_path);
 
   EXPECT_EQ(api_error::success,
@@ -1433,14 +1433,10 @@ static void remove_item_meta_restricted_names_fail(i_provider &provider) {
                app_config::get_provider_name(provider.get_provider_type()),
                __FUNCTION__);
 
-  if (provider.get_provider_type() == provider_type::encrypt) {
-    EXPECT_EQ(api_error::success,
-              provider.remove_item_meta(api_path, "user.custom"));
-    return;
-  }
-
   std::string api_path{"/rim_restricted.txt"};
-  create_file(provider, api_path);
+  if (provider.get_provider_type() != provider_type::encrypt) {
+    create_file(provider, api_path);
+  }
 
   for (const auto &key : META_PERMANENT_NAMES) {
     auto res = provider.remove_item_meta(api_path, std::string{key});