diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 2102ff270..45d27a14d 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -40,9 +40,8 @@ static const CLLocationCoordinate2D WorldTourDestinations[] = {
             @"MBXUserTrackingMode": @(MGLUserTrackingModeNone),
             @"MBXShowsUserLocation": @NO,
             @"MBXDebug": @NO,
+            @"MGLTelemetryTestServerURL": @"https://cloudfront-staging.tilestream.net",
         }];
-        
-        
     }
 }
 
diff --git a/platform/ios/app/app-info.plist b/platform/ios/app/app-info.plist
index 13452c942..3bece7118 100644
--- a/platform/ios/app/app-info.plist
+++ b/platform/ios/app/app-info.plist
@@ -24,8 +24,6 @@
 	<string>7877</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>MGLMetricsTestServerURL</key>
-	<string>https://cloudfront-staging.tilestream.net</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>
@@ -40,9 +38,9 @@
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2014–2016 Mapbox</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>The map will ALWAYS display the user's location.</string>
+	<string>The map will ALWAYS display the user’s location.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>The map will display the user's location.</string>
+	<string>The map will display the user’s location.</string>
 	<key>UILaunchStoryboardName</key>
 	<string>Default</string>
 	<key>UIMainStoryboardFile</key>
diff --git a/platform/ios/src/MGLAPIClient.m b/platform/ios/src/MGLAPIClient.m
index 91bc07442..5ce8b40f1 100644
--- a/platform/ios/src/MGLAPIClient.m
+++ b/platform/ios/src/MGLAPIClient.m
@@ -87,7 +87,7 @@ static NSString * const MGLAPIClientHTTPMethodPost = @"POST";
 }
 
 - (void)setupBaseURL {
-    NSString *testServerURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLMetricsTestServerURL"];
+    NSString *testServerURL = [[NSUserDefaults standardUserDefaults] stringForKey:@"MGLTelemetryTestServerURL"];
     if (testServerURL) {
         _baseURL = testServerURL;
         _usesTestServer = YES;