diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 752ca789c4..10c509cfde 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -141,7 +141,10 @@ int main(int argc, char ** argv)
   Platform & pl = GetPlatform();
 
   if (!FLAGS_user_resource_path.empty())
+  {
     pl.SetResourceDir(FLAGS_user_resource_path);
+    pl.SetSettingsDir(FLAGS_user_resource_path);
+  }
 
   std::string const path =
       FLAGS_data_path.empty() ? pl.WritableDir() : my::AddSlashIfNeeded(FLAGS_data_path);
diff --git a/platform/platform.cpp b/platform/platform.cpp
index 4be81636d8..86b3e9c2c4 100644
--- a/platform/platform.cpp
+++ b/platform/platform.cpp
@@ -97,7 +97,7 @@ bool Platform::RmDirRecursively(string const & dirName)
   return res;
 }
 
-void Platform::SetSettingsDirForTests(string const & path)
+void Platform::SetSettingsDir(string const & path)
 {
   m_settingsDir = my::AddSlashIfNeeded(path);
 }
diff --git a/platform/platform.hpp b/platform/platform.hpp
index ee5a73f24a..96f646cde4 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -163,7 +163,7 @@ public:
   /// as WritableDir, but on some platforms it's different
   string SettingsDir() const { return m_settingsDir; }
   /// Set settings dir — use for testing.
-  void SetSettingsDirForTests(string const & path);
+  void SetSettingsDir(string const & path);
   /// @return full path to file in the settings directory
   string SettingsPathForFile(string const & file) const { return SettingsDir() + file; }
 
diff --git a/platform/platform_tests_support/writable_dir_changer.cpp b/platform/platform_tests_support/writable_dir_changer.cpp
index f63799403f..5e3b70ea95 100644
--- a/platform/platform_tests_support/writable_dir_changer.cpp
+++ b/platform/platform_tests_support/writable_dir_changer.cpp
@@ -19,7 +19,7 @@ WritableDirChanger::WritableDirChanger(string const & testDir, SettingsDirPolicy
   TEST_EQUAL(Platform::ERR_OK, platform.MkDir(m_testDirFullPath), ());
   platform.SetWritableDirForTests(m_testDirFullPath);
   if (m_settingsDirPolicy == SettingsDirPolicy::UseWritableDir)
-    platform.SetSettingsDirForTests(m_testDirFullPath);
+    platform.SetSettingsDir(m_testDirFullPath);
   settings::Clear();
 }
 
@@ -30,6 +30,6 @@ WritableDirChanger::~WritableDirChanger()
   string const writableDirForTest = platform.WritableDir();
   platform.SetWritableDirForTests(m_writableDirBeforeTest);
   if (m_settingsDirPolicy == SettingsDirPolicy::UseWritableDir)
-    platform.SetSettingsDirForTests(m_writableDirBeforeTest);
+    platform.SetSettingsDir(m_writableDirBeforeTest);
   platform.RmDirRecursively(writableDirForTest);
 }