diff --git a/generator/generator_integration_tests/features_tests.cpp b/generator/generator_integration_tests/features_tests.cpp
index 0cb133f3a9..418a9cf670 100644
--- a/generator/generator_integration_tests/features_tests.cpp
+++ b/generator/generator_integration_tests/features_tests.cpp
@@ -452,10 +452,13 @@ private:
   void Init(std::string const & archiveName)
   {
     classificator::Load();
-    auto const & options = GetTestingOptions();
     auto & platform = GetPlatform();
-    platform.SetResourceDir(options.m_resourcePath);
-    platform.SetSettingsDir(options.m_resourcePath);
+
+    // Should be initialized in testingmain.cpp
+    //auto const & options = GetTestingOptions();
+    //platform.SetResourceDir(options.m_resourcePath);
+    //platform.SetSettingsDir(options.m_resourcePath);
+
     m_threadCount = static_cast<size_t>(platform.CpuCores());
     m_testPath = base::JoinPath(platform.WritableDir(), "gen-test");
     m_genInfo.SetNodeStorageType("map");
@@ -467,7 +470,7 @@ private:
     m_genInfo.m_osmFileName = base::JoinPath(m_testPath, "planet.o5m");
     m_genInfo.m_popularPlacesFilename = m_genInfo.GetIntermediateFileName("popular_places.csv");
     m_genInfo.m_idToWikidataFilename = m_genInfo.GetIntermediateFileName("wiki_urls.csv");
-    DecompressZipArchive(base::JoinPath(options.m_dataPath, archiveName + ".zip"), m_testPath);
+    DecompressZipArchive(base::JoinPath(platform.WritableDir(), archiveName + ".zip"), m_testPath);
 
     m_mixedNodesFilenames.first = base::JoinPath(platform.ResourcesDir(), MIXED_NODES_FILE);
     m_mixedNodesFilenames.second = base::JoinPath(platform.ResourcesDir(), MIXED_NODES_FILE "_");
diff --git a/platform/platform_tests/apk_test.cpp b/platform/platform_tests/apk_test.cpp
index c2b5dfa37e..50990919d0 100644
--- a/platform/platform_tests/apk_test.cpp
+++ b/platform/platform_tests/apk_test.cpp
@@ -95,6 +95,7 @@ namespace
 
 UNIT_TEST(ApkReader_Multithreaded)
 {
+  /// @todo Update test with current apk path.
   string const path = GetPlatform().WritableDir() + "../android/MapsWithMePro/bin/MapsWithMePro-production.apk";
 
   uint64_t size;
diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp
index 681c9dc502..5be1fc5c0d 100644
--- a/routing/routing_integration_tests/routing_test_tools.cpp
+++ b/routing/routing_integration_tests/routing_test_tools.cpp
@@ -104,6 +104,9 @@ unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource,
       numMwmIds->RegisterFile(countryFile);
   }
 
+  // You should have at least one country file to make further tests.
+  TEST(!numMwmIds->IsEmpty(), ());
+
   bool const loadAltitudes = vehicleType != VehicleType::Car;
   auto indexRouter = make_unique<IndexRouter>(vehicleType, loadAltitudes,
                                               *countryParentGetter, countryFileGetter,
diff --git a/routing_common/num_mwm_id.hpp b/routing_common/num_mwm_id.hpp
index 7a975a5d49..633ac68bea 100644
--- a/routing_common/num_mwm_id.hpp
+++ b/routing_common/num_mwm_id.hpp
@@ -18,6 +18,8 @@ NumMwmId constexpr kFakeNumMwmId = std::numeric_limits<NumMwmId>::max();
 class NumMwmIds final
 {
 public:
+  bool IsEmpty() const { return m_idToFile.empty(); }
+
   void RegisterFile(platform::CountryFile const & file)
   {
     if (ContainsFile(file))
diff --git a/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
index 019faafb3f..9f00a72f8b 100644
--- a/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
+++ b/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
@@ -127,15 +127,7 @@ std::string GetCompilerPath(std::string const & compilerName)
 {
   Platform & platform = GetPlatform();
   std::string compilerPath = base::JoinPath(kCompilersDir, compilerName);
-  if (platform.IsFileExistsByFullPath(compilerPath))
-    return compilerPath;
-
-  compilerPath = base::JoinPath(platform.ResourcesDir(), kCompilersDir, compilerName);
-  if (!platform.IsFileExistsByFullPath(compilerPath))
-  {
-    compilerPath = base::JoinPath(platform.WritableDir(), kCompilersDir, compilerName);
-    TEST(platform.IsFileExistsByFullPath(compilerPath), ("GLSL compiler not found"));
-  }
+  TEST(platform.IsFileExistsByFullPath(compilerPath), (kCompilersDir, "should present in executable dir"));
   return compilerPath;
 }
 }  // namespace