diff --git a/android/jni/com/mapswithme/maps/DownloaderAdapter.cpp b/android/jni/com/mapswithme/maps/DownloaderAdapter.cpp
index 85339803f8..93dddffa1e 100644
--- a/android/jni/com/mapswithme/maps/DownloaderAdapter.cpp
+++ b/android/jni/com/mapswithme/maps/DownloaderAdapter.cpp
@@ -95,6 +95,8 @@ void BackgroundDownloaderAdapter::Download(QueuedCountry && queuedCountry)
 
   auto const countryId = queuedCountry.GetCountryId();
   auto urls = MakeUrlList(queuedCountry.GetRelativeUrl());
+  // Get urls order from worst to best.
+  std::reverse(urls.begin(), urls.end());
   auto const path = queuedCountry.GetFileDownloadPath();
 
   // For safety reasons, add to the queue first and notify start downloading then,
diff --git a/storage/background_downloading/downloader_adapter_ios.mm b/storage/background_downloading/downloader_adapter_ios.mm
index 99db928d2a..cc587c2684 100644
--- a/storage/background_downloading/downloader_adapter_ios.mm
+++ b/storage/background_downloading/downloader_adapter_ios.mm
@@ -69,6 +69,8 @@ void BackgroundDownloaderAdapter::Download(QueuedCountry && queuedCountry)
 
   auto const countryId = queuedCountry.GetCountryId();
   auto urls = MakeUrlList(queuedCountry.GetRelativeUrl());
+  // Get urls order from worst to best.
+  std::reverse(urls.begin(), urls.end());
   auto const path = queuedCountry.GetFileDownloadPath();
 
   // The order is important here: add to the queue first, notify start downloading then.
diff --git a/storage/map_files_downloader_with_ping.hpp b/storage/map_files_downloader_with_ping.hpp
index 3d94fb7ae7..b4dfe9f339 100644
--- a/storage/map_files_downloader_with_ping.hpp
+++ b/storage/map_files_downloader_with_ping.hpp
@@ -6,7 +6,7 @@ namespace storage
 {
 class MapFilesDownloaderWithPing : public MapFilesDownloader
 {
-private:
+public:
   // MapFilesDownloader overrides:
   void GetServersList(ServersListCallback const & callback) override;
 };
diff --git a/storage/storage_tests/CMakeLists.txt b/storage/storage_tests/CMakeLists.txt
index cd1ef61364..0305a0c627 100644
--- a/storage/storage_tests/CMakeLists.txt
+++ b/storage/storage_tests/CMakeLists.txt
@@ -6,6 +6,7 @@ set(
   SRC
   country_info_getter_tests.cpp
   country_name_getter_tests.cpp
+  downloader_tests.cpp
   fake_map_files_downloader.cpp
   fake_map_files_downloader.hpp
   helpers.cpp
diff --git a/storage/storage_tests/downloader_tests.cpp b/storage/storage_tests/downloader_tests.cpp
new file mode 100644
index 0000000000..add6d7c9b7
--- /dev/null
+++ b/storage/storage_tests/downloader_tests.cpp
@@ -0,0 +1,35 @@
+#include "testing/testing.hpp"
+
+#include "storage/map_files_downloader_with_ping.hpp"
+
+#include "base/logging.hpp"
+
+#include "private.h"
+
+namespace
+{
+
+class DownloaderStub : public storage::MapFilesDownloaderWithPing
+{
+  virtual void Download(storage::QueuedCountry && queuedCountry)
+  {
+  }
+};
+
+} // namespace
+
+UNIT_TEST(GetServersList)
+{
+  if (std::string(METASERVER_URL).empty())
+    return;
+
+  base::ScopedLogLevelChanger logLevel(base::LDEBUG);
+  Platform::ThreadRunner runner;
+
+  DownloaderStub().GetServersList([](std::vector<std::string> const & vec)
+  {
+    TEST_GREATER(vec.size(), 0, ());
+    for (auto const & s : vec)
+      LOG(LINFO, (s));
+  });
+}