diff --git a/indexer/indexer_tests/mwm_set_test.cpp b/indexer/indexer_tests/mwm_set_test.cpp
index fae9313a28..b6e26a0278 100644
--- a/indexer/indexer_tests/mwm_set_test.cpp
+++ b/indexer/indexer_tests/mwm_set_test.cpp
@@ -1,22 +1,13 @@
 #include "../../testing/testing.hpp"
 #include "../mwm_set.hpp"
 
-#include "../../coding/file_container.hpp"
-
-#include "../../platform/platform.hpp"
 
 namespace
 {
-class MwmValue : public MwmSet::MwmValueBase
-{
-  FilesContainerR m_cont;
-public:
-  MwmValue(string const & name) : m_cont(name) {}
-};
-}  // unnamed namespace
+  class MwmValue : public MwmSet::MwmValueBase
+  {
+  };
 
-namespace
-{
   class TestMwmSet : public MwmSet
   {
   protected:
@@ -27,15 +18,14 @@ namespace
     }
     virtual MwmValue * CreateValue(string const &) const
     {
-      return new MwmValue(GetPlatform().WritablePathForFile("minsk-pass.mwm"));
-    }
-    virtual void DestroyValue(MwmValue * p) const
-    {
-      delete p;
+      return new MwmValue();
     }
 
   public:
-    ~TestMwmSet() { Cleanup(); }
+    ~TestMwmSet()
+    {
+      Cleanup();
+    }
   };
 }  // unnamed namespace
 
diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp
index 4d8628915d..4c3a6823f9 100644
--- a/indexer/mwm_set.hpp
+++ b/indexer/mwm_set.hpp
@@ -74,8 +74,6 @@ protected:
   void Cleanup();
 
 private:
-  friend class MwmLock;
-
   static const MwmId INVALID_MWM_ID = static_cast<MwmId>(-1);
 
   typedef deque<pair<MwmId, MwmValueBase *> > CacheType;