diff --git a/map/map_tests/power_manager_tests.cpp b/map/map_tests/power_manager_tests.cpp
index f7b8d568b2..6ae9954b2c 100644
--- a/map/map_tests/power_manager_tests.cpp
+++ b/map/map_tests/power_manager_tests.cpp
@@ -280,7 +280,7 @@ UNIT_TEST(PowerManager_OnBatteryLevelChanged)
   TEST_EQUAL(manager.GetScheme(), Scheme::Auto, ());
 
   TEST_EQUAL(subscriber.m_onShemeEvents.size(), 0, ());
-  TEST_EQUAL(subscriber.m_onFacilityEvents.size(), 12, ());
+  TEST_EQUAL(subscriber.m_onFacilityEvents.size(), 9, ());
 
   auto const & facilityEvents = subscriber.m_onFacilityEvents;
   for (size_t i = 0; i < facilityEvents.size(); ++i)
diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp
index bfa74f78a2..e1ab81beaf 100644
--- a/storage/storage_tests/storage_tests.cpp
+++ b/storage/storage_tests/storage_tests.cpp
@@ -651,6 +651,8 @@ UNIT_TEST(StorageTest_FailedDownloading)
   DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(), countryFile);
   SCOPE_GUARD(cleanup, [&]() {
     DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(), countryFile);
+    // Failed country is added into the "retry later" list, and fails next test.
+    storage.Clear();
   });
 
   {