diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 112c702046..5743e89b33 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -371,7 +371,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
 
 - (void)viewDidLayoutSubviews {
   [super viewDidLayoutSubviews];
-  if (!self.mapView.drapeEngineCreated && !MapsAppDelegate.isDrapeDisabled)
+  if (!self.mapView.drapeEngineCreated && !MapsAppDelegate.isTestsEnvironment)
     [self.mapView createDrapeEngine];
 }
 
diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h
index 14821264cb..fbd72a8e79 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.h
+++ b/iphone/Maps/Classes/MapsAppDelegate.h
@@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSUInteger)badgeNumber;
 
-+ (BOOL)isDrapeDisabled;
++ (BOOL)isTestsEnvironment;
 
 @end
 
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 96aa60eb70..344d3916e5 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -121,7 +121,9 @@ using namespace osm_auth_ios;
   }
   [self enableTTSForTheFirstTime];
 
-  [[CloudStorageManager shared] start];
+  if (![MapsAppDelegate isTestsEnvironment])
+    [[CloudStorageManager shared] start];
+  
   [[DeepLinkHandler shared] applicationDidFinishLaunching:launchOptions];
   // application:openUrl:options is called later for deep links if YES is returned.
   return YES;
@@ -226,8 +228,8 @@ using namespace osm_auth_ios;
   LOG(LINFO, ("applicationDidBecomeActive - end"));
 }
 
-// TODO: Drape enabling is skipped during the test run due to the app crashing in teardown. This is a temporary solution. Drape should be properly disabled instead of merely skipping the enabling process.
-+ (BOOL)isDrapeDisabled {
+// TODO: Drape enabling and iCloud sync are skipped during the test run due to the app crashing in teardown. This is a temporary solution. Drape should be properly disabled instead of merely skipping the enabling process.
++ (BOOL)isTestsEnvironment {
   NSProcessInfo * processInfo = [NSProcessInfo processInfo];
   NSArray<NSString *> * launchArguments = [processInfo arguments];
   BOOL isTests = [launchArguments containsObject:@"-IsTests"];
diff --git a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
index 965ddf3dfb..13d5b6ef55 100644
--- a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
+++ b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
@@ -22,7 +22,7 @@ final class CarPlayMapViewController: MWMViewController {
 
   override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
-    if mapView?.drapeEngineCreated == false && !MapsAppDelegate.isDrapeDisabled() {
+    if mapView?.drapeEngineCreated == false && !MapsAppDelegate.isTestsEnvironment() {
       mapView?.createDrapeEngine()
     }
     updateVisibleViewPortState(viewPortState)