diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp
index 887518bde9..500621e51f 100644
--- a/indexer/indexer_tests/index_builder_test.cpp
+++ b/indexer/indexer_tests/index_builder_test.cpp
@@ -12,6 +12,7 @@
 
 #include "../../coding/file_container.hpp"
 
+#include "../../base/macros.hpp"
 #include "../../base/stl_add.hpp"
 
 
@@ -58,7 +59,7 @@ UNIT_TEST(BuildIndexTest)
   {
     // Check that index actually works.
     Index index;
-    index.Register(fileName);
+    UNUSED_VALUE(index.Register(fileName));
 
     // Make sure that index is actually parsed.
     NoopFunctor fn;
diff --git a/indexer/indexer_tests/index_test.cpp b/indexer/indexer_tests/index_test.cpp
index 75f98a7133..9ef9cfdb81 100644
--- a/indexer/indexer_tests/index_test.cpp
+++ b/indexer/indexer_tests/index_test.cpp
@@ -75,7 +75,7 @@ private:
 UNIT_TEST(Index_Parse)
 {
   Index index;
-  index.RegisterMap("minsk-pass" DATA_FILE_EXTENSION);
+  UNUSED_VALUE(index.RegisterMap("minsk-pass" DATA_FILE_EXTENSION));
 
   // Make sure that index is actually parsed.
   NoopFunctor fn;
diff --git a/indexer/indexer_tests/mwm_set_test.cpp b/indexer/indexer_tests/mwm_set_test.cpp
index 861de5e102..90f05268b7 100644
--- a/indexer/indexer_tests/mwm_set_test.cpp
+++ b/indexer/indexer_tests/mwm_set_test.cpp
@@ -1,6 +1,8 @@
 #include "../../testing/testing.hpp"
+
 #include "../mwm_set.hpp"
 
+#include "../../base/macros.hpp"
 
 namespace
 {
@@ -36,9 +38,9 @@ UNIT_TEST(MwmSetSmokeTest)
   TestMwmSet mwmSet;
   vector<MwmInfo> info;
 
-  mwmSet.Register("0");
-  mwmSet.Register("1");
-  mwmSet.Register("2");
+  UNUSED_VALUE(mwmSet.Register("0"));
+  UNUSED_VALUE(mwmSet.Register("1"));
+  UNUSED_VALUE(mwmSet.Register("2"));
   mwmSet.Deregister("1");
   mwmSet.GetMwmInfo(info);
   TEST_EQUAL(info.size(), 3, ());
@@ -54,7 +56,7 @@ UNIT_TEST(MwmSetSmokeTest)
     TEST(!lock1.IsLocked(), ());
   }
 
-  mwmSet.Register("3");
+  UNUSED_VALUE(mwmSet.Register("3"));
   mwmSet.GetMwmInfo(info);
   TEST_EQUAL(info.size(), 3, ());
   TEST(info[0].IsUpToDate(), ());
@@ -68,7 +70,7 @@ UNIT_TEST(MwmSetSmokeTest)
     MwmSet::MwmLock lock(mwmSet, 1);
     TEST(lock.IsLocked(), ());
     mwmSet.Deregister("3");
-    mwmSet.Register("4");
+    UNUSED_VALUE(mwmSet.Register("4"));
   }
   mwmSet.GetMwmInfo(info);
   TEST_EQUAL(info.size(), 4, ());
@@ -80,7 +82,7 @@ UNIT_TEST(MwmSetSmokeTest)
   TEST(info[3].IsUpToDate(), ());
   TEST_EQUAL(info[3].m_maxScale, 4, ());
 
-  mwmSet.Register("5");
+  UNUSED_VALUE(mwmSet.Register("5"));
   mwmSet.GetMwmInfo(info);
   TEST_EQUAL(info.size(), 4, ());
   TEST(info[0].IsUpToDate(), ());
diff --git a/map/benchmark_tool/features_loading.cpp b/map/benchmark_tool/features_loading.cpp
index 957006104a..4e979bfb7e 100644
--- a/map/benchmark_tool/features_loading.cpp
+++ b/map/benchmark_tool/features_loading.cpp
@@ -9,9 +9,9 @@
 
 #include "../../platform/platform.hpp"
 
+#include "../../base/macros.hpp"
 #include "../../base/timer.hpp"
 
-
 namespace bench
 {
 
@@ -110,7 +110,7 @@ void RunFeaturesLoadingBenchmark(string const & file, pair<int, int> scaleR, All
     return;
 
   model::FeaturesFetcher src;
-  src.RegisterMap(file);
+  UNUSED_VALUE(src.RegisterMap(file));
 
   RunBenchmark(src, header.GetBounds(), scaleR, res);
 }
diff --git a/map/mwm_tests/multithread_mwm_test.cpp b/map/mwm_tests/multithread_mwm_test.cpp
index ce0854434f..604e1817c5 100644
--- a/map/mwm_tests/multithread_mwm_test.cpp
+++ b/map/mwm_tests/multithread_mwm_test.cpp
@@ -4,9 +4,9 @@
 
 #include "../../indexer/scales.hpp"
 
+#include "../../base/macros.hpp"
 #include "../../base/thread.hpp"
 
-
 namespace
 {
   typedef model::FeaturesFetcher SourceT;
@@ -63,7 +63,7 @@ namespace
     SourceT src;
     src.InitClassificator();
 
-    src.RegisterMap(file + DATA_FILE_EXTENSION);
+    UNUSED_VALUE(src.RegisterMap(file + DATA_FILE_EXTENSION));
 
     // Check that country rect is valid and not infinity.
     m2::RectD const r = src.GetWorldRect();
diff --git a/map/mwm_tests/mwm_foreach_test.cpp b/map/mwm_tests/mwm_foreach_test.cpp
index 7eebb58e80..a7e59f8245 100644
--- a/map/mwm_tests/mwm_foreach_test.cpp
+++ b/map/mwm_tests/mwm_foreach_test.cpp
@@ -14,6 +14,7 @@
 #include "../../geometry/robust_orientation.hpp"
 
 #include "../../base/logging.hpp"
+#include "../../base/macros.hpp"
 
 #include "../../std/string.hpp"
 #include "../../std/algorithm.hpp"
@@ -251,7 +252,7 @@ void RunTest(string const & file)
   model::FeaturesFetcher src1;
   src1.InitClassificator();
 
-  src1.RegisterMap(file);
+  UNUSED_VALUE(src1.RegisterMap(file));
 
   vector<m2::RectD> rects;
   rects.push_back(src1.GetWorldRect());