diff --git a/.travis.yml b/.travis.yml
index 6b0f7563..52c587ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,6 @@ env:
     - BUILD_MODE="debug"
     - BUILD_MODE="asan"
     - BUILD_MODE="ubsan"
-    - BUILD_MODE="ios-arm"
-    - BUILD_MODE="ios-arm64"
-    - BUILD_MODE="ios-watch"
-    - BUILD_MODE="ios-tv"
 
 matrix:
 
@@ -88,18 +84,21 @@ matrix:
       env:
         - BUILD_MODE=android
         - PLATFORM=x86_64
-    - os: osx
-      env:
-        - BUILD_MODE=ios
-        - PLATFORM=iPhoneOS
-    - os: osx
-      env:
-        - BUILD_MODE=ios
-        - PLATFORM=WatchOS
-    - os: osx
-      env:
-        - BUILD_MODE=ios
-        - PLATFORM=AppleTVOS
+
+    # Travis infrastructure problems, Issue 570
+    # Re-enable when OS X and iOS improves
+    #- os: osx
+    #  env:
+    #    - BUILD_MODE=ios
+    #    - PLATFORM=iPhoneOS
+    #- os: osx
+    #  env:
+    #    - BUILD_MODE=ios
+    #    - PLATFORM=WatchOS
+    #- os: osx
+    #  env:
+    #    - BUILD_MODE=ios
+    #    - PLATFORM=AppleTVOS
 
 before_install:
   - |
diff --git a/TestScripts/install-android.sh b/TestScripts/install-android.sh
index 7c31ef60..09a56c17 100755
--- a/TestScripts/install-android.sh
+++ b/TestScripts/install-android.sh
@@ -14,4 +14,4 @@ echo y | $HOME/android/sdk/tools/bin/sdkmanager --update > /dev/null
 for package in "ndk-bundle"; do
 	echo install android $package
 	echo y | $HOME/android/sdk/tools/bin/sdkmanager "$package" > /dev/null
-done 
+done