diff --git a/coding/coding_tests/base64_test.cpp b/coding/coding_tests/base64_test.cpp
index a2ccb1bff3..49eb44d5a5 100644
--- a/coding/coding_tests/base64_test.cpp
+++ b/coding/coding_tests/base64_test.cpp
@@ -5,12 +5,12 @@
 
 UNIT_TEST(Base64_Encode)
 {
-  TEST_EQUAL(base64::encode("Hello, world!"), "SGVsbG8sIHdvcmxkIQ", ());
+  TEST_EQUAL(base64::encode("Hello, world!"), "SGVsbG8sIHdvcmxkITAw", ());
   TEST_EQUAL(base64::encode(""), "", ());
-  TEST_EQUAL(base64::encode("$"), "JA", ());
+  TEST_EQUAL(base64::encode("$"), "JDAw", ());
   TEST_EQUAL(base64::encode("MapsWithMe is an offline maps application for any device in the world."),
-             "TWFwc1dpdGhNZSBpcyBhbiBvZmZsaW5lIG1hcHMgYXBwbGljYXRpb24gZm9yIGFueSBkZXZpY2Ug"
-             "aW4gdGhlIHdvcmxkLg", ());
+    "TWFwc1dpdGhNZSBpcyBhbiBvZmZsaW5lIG1hcHMgYXBwbGljYXRpb24gZm9yIGFueSBkZXZpY2Ug"
+    "aW4gdGhlIHdvcmxkLjAw", ());
 }
 
 UNIT_TEST(Base64_Decode)
diff --git a/indexer/indexer_tests/geometry_coding_test.cpp b/indexer/indexer_tests/geometry_coding_test.cpp
index f423595d89..87735f0f15 100644
--- a/indexer/indexer_tests/geometry_coding_test.cpp
+++ b/indexer/indexer_tests/geometry_coding_test.cpp
@@ -1,20 +1,20 @@
 #include "../geometry_coding.hpp"
 #include "../../testing/testing.hpp"
 
-#include "../../indexer/mercator.hpp"
-#include "../../indexer/point_to_int64.hpp"
+//#include "../../indexer/mercator.hpp"
+//#include "../../indexer/point_to_int64.hpp"
 
 #include "../../geometry/geometry_tests/large_polygon.hpp"
 #include "../../geometry/distance.hpp"
 #include "../../geometry/simplification.hpp"
-#include "../../geometry/pointu_to_uint64.hpp"
+//#include "../../geometry/pointu_to_uint64.hpp"
 
 #include "../../coding/byte_stream.hpp"
 #include "../../coding/varint.hpp"
 #include "../../coding/writer.hpp"
 
 #include "../../base/logging.hpp"
-#include "../../base/array_adapters.hpp"
+//#include "../../base/array_adapters.hpp"
 
 
 typedef m2::PointU PU;
@@ -168,3 +168,5 @@ UNIT_TEST(EncodePolyline)
     TestEncodePolyline("4000simp", maxPoint, SimplifyPoints(points, 4000));
   }
 }
+
+// see 476c1d1d125f0c2deb8c commit for special decode test
\ No newline at end of file