diff --git a/geometry/geometry_tests/large_polygon.hpp b/geometry/geometry_tests/large_polygon.hpp
index 744d9c7baf..5909852eed 100644
--- a/geometry/geometry_tests/large_polygon.hpp
+++ b/geometry/geometry_tests/large_polygon.hpp
@@ -1,5 +1,8 @@
 #include "../point2d.hpp"
 
+namespace LargePolygon
+{
+
 typedef m2::PointD P;
 
 // This is actually part of coastline of Australia.
@@ -5545,3 +5548,5 @@ m2::PointD const kLargePolygon[] =
   P(136.0341491699219,-12.4697208404541),
   P(136.0397033691406,-12.47166633605957)
 };
+
+} // namespace LargePolygon
diff --git a/geometry/geometry_tests/simplification_test.cpp b/geometry/geometry_tests/simplification_test.cpp
index a130d48c0b..9a457fe02a 100644
--- a/geometry/geometry_tests/simplification_test.cpp
+++ b/geometry/geometry_tests/simplification_test.cpp
@@ -163,5 +163,5 @@ UNIT_TEST(Simpfication_DP_DegenerateTrg)
 
 #include "large_polygon.hpp"
 
-m2::PointD const * LargePolylineTestData::m_Data = kLargePolygon;
-size_t LargePolylineTestData::m_Size = ARRAY_SIZE(kLargePolygon);
+m2::PointD const * LargePolylineTestData::m_Data = LargePolygon::kLargePolygon;
+size_t LargePolylineTestData::m_Size = ARRAY_SIZE(LargePolygon::kLargePolygon);
diff --git a/indexer/indexer_tests/geometry_coding_test.cpp b/indexer/indexer_tests/geometry_coding_test.cpp
index 034a4abe55..34317161e3 100644
--- a/indexer/indexer_tests/geometry_coding_test.cpp
+++ b/indexer/indexer_tests/geometry_coding_test.cpp
@@ -131,7 +131,7 @@ void TestEncodePolyline(string name, m2::PointU maxPoint, vector<m2::PointU> con
 
 UNIT_TEST(EncodePolyline)
 {
-  size_t const kSizes [] = { 0, 1, 2, 3, 4, ARRAY_SIZE(kLargePolygon) };
+  size_t const kSizes [] = { 0, 1, 2, 3, 4, ARRAY_SIZE(LargePolygon::kLargePolygon) };
   m2::PointU const maxPoint(1000000000, 1000000000);
   for (size_t iSize = 0; iSize < ARRAY_SIZE(kSizes); ++iSize)
   {
@@ -139,8 +139,8 @@ UNIT_TEST(EncodePolyline)
     vector<m2::PointU> points;
     points.reserve(polygonSize);
     for (size_t i = 0; i < polygonSize; ++i)
-      points.push_back(m2::PointU(static_cast<uint32_t>(kLargePolygon[i].x * 10000),
-                                  static_cast<uint32_t>((kLargePolygon[i].y + 200) * 10000)));
+      points.push_back(m2::PointU(static_cast<uint32_t>(LargePolygon::kLargePolygon[i].x * 10000),
+                                  static_cast<uint32_t>((LargePolygon::kLargePolygon[i].y + 200) * 10000)));
 
     TestEncodePolyline("Unsimp", maxPoint, points);
     TestEncodePolyline("1simp", maxPoint, SimplifyPoints(points, 1));