diff --git a/.travis.yml b/.travis.yml
index e5b94a813a1..ccd4cd035f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +25,10 @@ matrix:
           sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
           packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
     - os: osx
-      osx_image: beta-xcode6.3
+      osx_image: beta-xcode6.4
       env: FLAVOR=osx BUILDTYPE=Debug
     - os: osx
-      osx_image: beta-xcode6.3
+      osx_image: beta-xcode6.4
       env: FLAVOR=ios BUILDTYPE=Release
     - os: linux
       env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release
diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index eb8d909dba0..314d50dd01f 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -604,10 +604,7 @@ - (void) postEvents:(NS_ARRAY_OF(MGLMapboxEventAttributes *) *)events {
             [request setHTTPBody:jsonData];
 
             // Send non blocking HTTP Request to server
-            NSURLSessionDataTask *task = [_session dataTaskWithRequest:request completionHandler:^(__unused NSData * __nullable data, __unused NSURLResponse * __nullable response, __unused NSError * __nullable error)
-            {
-            }];
-            [task resume];
+            [[_session dataTaskWithRequest:request] resume];
         }
     });
 }
diff --git a/scripts/ios/test.sh b/scripts/ios/test.sh
index bfaed4646df..170aa0f64e2 100755
--- a/scripts/ios/test.sh
+++ b/scripts/ios/test.sh
@@ -7,5 +7,5 @@ set -u
 xctool \
     -project ./test/ios/ios-tests.xcodeproj \
     -scheme 'Mapbox GL Tests' \
-    -sdk iphonesimulator8.3 \
+    -sdk iphonesimulator8.4 \
     test