diff --git a/indexer/indexer_tests/mwm_set_test.cpp b/indexer/indexer_tests/mwm_set_test.cpp
index 68beabd2ea..73114995b4 100644
--- a/indexer/indexer_tests/mwm_set_test.cpp
+++ b/indexer/indexer_tests/mwm_set_test.cpp
@@ -1,6 +1,7 @@
 #include "../../testing/testing.hpp"
 #include "../mwm_set.hpp"
 #include "../../coding/file_container.hpp"
+#include "../../platform/platform.hpp"
 
 namespace
 {
@@ -11,7 +12,7 @@ void SetMwmInfoForTest(string const & path, MwmInfo & info)
 }
 FilesContainerR * CreateFileContainerForTest(string const &)
 {
-  return new FilesContainerR("minsk-pass.mwm");
+  return new FilesContainerR(GetPlatform().WritablePathForFile("minsk-pass.mwm"));
 }
 }  // unnamed namespace
 
diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp
index f592cfd7e3..3aeabd4a12 100644
--- a/indexer/mwm_set.hpp
+++ b/indexer/mwm_set.hpp
@@ -88,7 +88,7 @@ private:
   vector<string> m_name;
   CacheType m_cache;
   size_t m_cacheSize;
-  function<void (string const &, MwmInfo &)> m_fnGetMwmInfo;
-  function<FilesContainerR * (string const &)> const & m_fnCreateContainer;
+  function<void (string const &, MwmInfo &)> const m_fnGetMwmInfo;
+  function<FilesContainerR * (string const &)> const m_fnCreateContainer;
   threads::Mutex m_lock;
 };