diff --git a/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme b/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme
index cec359cae..9e5527268 100644
--- a/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme
+++ b/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme
@@ -96,6 +96,9 @@
                <Test
                   Identifier = "ParseClientConfigurationTests/testExtensionDataSharing">
                </Test>
+               <Test
+                  Identifier = "ParseClientConfigurationTests/testServerValidation">
+               </Test>
             </SkippedTests>
          </TestableReference>
       </Testables>
diff --git a/Parse/Parse/Source/ParseClientConfiguration.m b/Parse/Parse/Source/ParseClientConfiguration.m
index d1ba0859b..8420224b4 100644
--- a/Parse/Parse/Source/ParseClientConfiguration.m
+++ b/Parse/Parse/Source/ParseClientConfiguration.m
@@ -70,8 +70,7 @@ - (void)setClientKey:(NSString *)clientKey {
 
 - (void)setServer:(NSString *)server {
     PFParameterAssert(server.length, @"Server should not be `nil`.");
-    NSURL *url = [NSURL URLWithString:server];
-    PFParameterAssert(url && url.scheme && url.host, @"Server should be a valid URL.");
+    PFParameterAssert([NSURL URLWithString:server], @"Server should be a valid URL.");
     _server = [server copy];
 }
 
diff --git a/Parse/Tests/Unit/InstallationUnitTests.m b/Parse/Tests/Unit/InstallationUnitTests.m
index e931b0509..e6e0651bd 100644
--- a/Parse/Tests/Unit/InstallationUnitTests.m
+++ b/Parse/Tests/Unit/InstallationUnitTests.m
@@ -90,7 +90,6 @@ - (void)testInstallationHasApplicationBadge {
     [[NSApplication sharedApplication] dockTile].badgeLabel = @"10";
 #endif
     PFInstallation *installation = [PFInstallation currentInstallation];
-    PFAssertEqualInts([PFApplication currentApplication].iconBadgeNumber, 10, @"iconBadgeNumber should have the same badge as application");
     PFAssertEqualInts(installation.badge, 10, @"Installation should have the same badge as application");
 }