diff --git a/omim.pro b/omim.pro
index efdee28228..58ecaa9533 100644
--- a/omim.pro
+++ b/omim.pro
@@ -139,7 +139,7 @@ SUBDIRS = 3party base coding geometry indexer routing
     SUBDIRS *= routing_integration_tests
 
     routing_consistency_tests.subdir = routing/routing_consistency_tests
-    routing_consistency_tests.depends =  $$SUBDIRS
+    routing_consistency_tests.depends = $$MapDepLibs routing
     SUBDIRS *= routing_consistency_tests
 
     # TODO(AlexZ): Move pedestrian tests into routing dir.
diff --git a/routing/routing_consistency_tests/routing_consistency_tests.cpp b/routing/routing_consistency_tests/routing_consistency_tests.cpp
index a2daf0c80a..eb80cd6f23 100644
--- a/routing/routing_consistency_tests/routing_consistency_tests.cpp
+++ b/routing/routing_consistency_tests/routing_consistency_tests.cpp
@@ -16,7 +16,6 @@
 
 #include "3party/gflags/src/gflags/gflags.h"
 
-
 using namespace routing;
 using storage::CountryInfo;
 
@@ -65,7 +64,7 @@ bool ParseUserString(string const & incomeString, UserRoutingRecord & result)
   it = incomeString.find("name=vehicle");
   if (it == string::npos)
     return false;
-  if (GetDouble(incomeString, "startDirectionX") != 0 && GetDouble(incomeString, "startDirectionX") != 0)
+  if (GetDouble(incomeString, "startDirectionX") != 0 && GetDouble(incomeString, "startDirectionY") != 0)
     return false;
 
   // Extract numbers from a record.
@@ -78,10 +77,8 @@ bool ParseUserString(string const & incomeString, UserRoutingRecord & result)
 class RouteTester
 {
 public:
-  RouteTester(string const & baseDir) :  m_components(integration::GetOsrmComponents())
+  RouteTester() :  m_components(integration::GetOsrmComponents())
   {
-    CHECK(borders::LoadCountriesList(baseDir, m_countries),
-          ("Error loading country polygons files"));
   }
 
   bool BuildRoute(UserRoutingRecord const & record)
@@ -93,8 +90,8 @@ public:
       return false;
     }
     auto const delta = record.distance * kRouteLengthAccuracy;
-    auto const routeLength = result.first->GetFollowedPolyline().GetDistanceToEndM();
-    if (std::abs(routeLength - record.distance) < delta)
+    auto const routeLength = result.first->GetTotalDistanceMeters();
+    if (abs(routeLength - record.distance) < delta)
       return true;
 
     LOG(LINFO, ("Route has invalid length. Expected:", record.distance, "have:", routeLength));
@@ -145,7 +142,6 @@ public:
   }
 
 private:
-  borders::CountriesContainerT m_countries;
   integration::IRouterComponents & m_components;
 
   map<string, size_t> m_checkedCountries;
@@ -167,7 +163,7 @@ void ReadInput(istream & stream, RouteTester & tester)
       {
         if (FLAGS_verbose)
           LOG(LINFO, ("Checked", line));
-        tester.BuildRoute(record);
+        tester.BuildRouteByRecord(record);
       }
   }
   tester.PrintStatistics();
@@ -183,7 +179,7 @@ int main(int argc, char ** argv)
   if (FLAGS_input_file.empty())
     return 1;
 
-  RouteTester tester(FLAGS_data_path);
+  RouteTester tester;
   ifstream stream(FLAGS_input_file);
   ReadInput(stream, tester);
 
diff --git a/routing/routing_integration_tests/osrm_route_test.cpp b/routing/routing_integration_tests/osrm_route_test.cpp
index 55f96eb39c..e17e11a3e2 100644
--- a/routing/routing_integration_tests/osrm_route_test.cpp
+++ b/routing/routing_integration_tests/osrm_route_test.cpp
@@ -8,6 +8,13 @@ using namespace routing;
 
 namespace
 {
+  UNIT_TEST(StrangeCaseInAfrica)
+  {
+    integration::CalculateRouteAndTestRouteLength(
+        integration::GetOsrmComponents(), MercatorBounds::FromLatLon(19.207890000000002573, 30.506630000000001246), {0., 0.},
+        MercatorBounds::FromLatLon(19.172889999999998878, 30.473150000000000404), 7250.);
+  }
+
   // Node filtering test. SVO has many restricted service roads that absent in a OSRM index.
   UNIT_TEST(MoscowToSVOAirport)
   {
diff --git a/routing/routing_integration_tests/routing_test_tools.hpp b/routing/routing_integration_tests/routing_test_tools.hpp
index 028d7845c9..93e505e022 100644
--- a/routing/routing_integration_tests/routing_test_tools.hpp
+++ b/routing/routing_integration_tests/routing_test_tools.hpp
@@ -1,19 +1,19 @@
 #pragma once
 
+#include "routing/osrm_router.hpp"
+
+#include "storage/country_info_getter.hpp"
+
+#include "map/feature_vec_model.hpp"
+
+#include "platform/local_country_file.hpp"
+
 #include "std/set.hpp"
 #include "std/shared_ptr.hpp"
 #include "std/string.hpp"
 #include "std/utility.hpp"
 #include "std/vector.hpp"
 
-#include "routing/osrm_router.hpp"
-
-#include "platform/local_country_file.hpp"
-
-#include "storage/country_info_getter.hpp"
-
-#include "map/feature_vec_model.hpp"
-
 /*
  * These tests are developed to simplify routing integration tests writing.
  * You can use the interface bellow however you want but there are some hints.
diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp
index 8bd59eb4ec..07febdd437 100644
--- a/routing/turns_generator.cpp
+++ b/routing/turns_generator.cpp
@@ -13,6 +13,7 @@
 
 #include "3party/osrm/osrm-backend/data_structures/internal_route_result.hpp"
 
+#include "std/cmath.hpp"
 #include "std/numeric.hpp"
 #include "std/string.hpp"
 
diff --git a/std/cmath.hpp b/std/cmath.hpp
index dbd007bf76..0601e73eaa 100644
--- a/std/cmath.hpp
+++ b/std/cmath.hpp
@@ -11,6 +11,8 @@
 #define new DEBUG_NEW
 #endif
 
+using std::abs;
+
 namespace math
 {
   double constexpr pi = 3.14159265358979323846;