diff --git a/libs/base/base_tests/regexp_test.cpp b/libs/base/base_tests/regexp_test.cpp
index 7fff59742..dae8245ec 100644
--- a/libs/base/base_tests/regexp_test.cpp
+++ b/libs/base/base_tests/regexp_test.cpp
@@ -9,7 +9,7 @@ namespace regexp_test
 template <typename Fn>
 void ForEachMatched(std::string const & s, boost::regex const & regex, Fn && fn)
 {
-  for (std::sregex_token_iterator cur(s.begin(), s.end(), regex), end; cur != end; ++cur)
+  for (boost::sregex_token_iterator cur(s.begin(), s.end(), regex), end; cur != end; ++cur)
     fn(*cur);
 }
 
diff --git a/libs/platform/platform_tests/downloader_tests/downloader_test.cpp b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
index aca39751d..c533d2d9b 100644
--- a/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
+++ b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
@@ -11,6 +11,8 @@
 #include "base/logging.hpp"
 #include "base/std_serialization.hpp"
 
+#include <boost/regex.hpp>
+
 #include <QtCore/QCoreApplication>
 
 #include <functional>
@@ -395,7 +397,7 @@ void DeleteTempDownloadFiles()
   // Remove data from previously failed files.
 
   // Get regexp like this: (\.downloading3$|\.resume3$)
-  string const regexp = "(\\" RESUME_FILE_EXTENSION "$|\\" DOWNLOADING_FILE_EXTENSION "$)";
+  static boost::regex const regexp("(\\" RESUME_FILE_EXTENSION "$|\\" DOWNLOADING_FILE_EXTENSION "$)");
 
   Platform::FilesList files;
   Platform::GetFilesByRegExp(".", regexp, files);
diff --git a/libs/platform/platform_tests/platform_test.cpp b/libs/platform/platform_tests/platform_test.cpp
index 3af643cd3..44ddea2c8 100644
--- a/libs/platform/platform_tests/platform_test.cpp
+++ b/libs/platform/platform_tests/platform_test.cpp
@@ -102,7 +102,7 @@ UNIT_TEST(GetFilesInDir_Smoke)
 
   TEST(base::IsExist(files1, "minsk-pass.mwm"), ());
 
-  pl.GetFilesByRegExp(dir, boost::regex(".*\\" + DATA_FILE_EXTENSION + "$"), files2);
+  pl.GetFilesByRegExp(dir, boost::regex(std::string(".*\\") + DATA_FILE_EXTENSION + std::string("$")), files2);
   TEST_EQUAL(files1, files2, ());
 
   files1.clear();
diff --git a/tools/openlr/openlr_stat/openlr_stat.cpp b/tools/openlr/openlr_stat/openlr_stat.cpp
index 08650b8c4..72a6ad5b8 100644
--- a/tools/openlr/openlr_stat/openlr_stat.cpp
+++ b/tools/openlr/openlr_stat/openlr_stat.cpp
@@ -62,7 +62,7 @@ void LoadDataSources(std::string const & pathToMWMFolder, std::vector<FrozenData
   CHECK(Platform::IsDirectory(pathToMWMFolder), (pathToMWMFolder, "must be a directory."));
 
   Platform::FilesList files;
-  Platform::GetFilesByRegExp(pathToMWMFolder, boost::regex(".*\\") + DATA_FILE_EXTENSION, files);
+  Platform::GetFilesByRegExp(pathToMWMFolder, boost::regex(std::string(".*\\") + DATA_FILE_EXTENSION), files);
 
   CHECK(!files.empty(), (pathToMWMFolder, "Contains no .mwm files."));