diff --git a/ci/run.sh b/ci/run.sh
index 23b3693..5a6273c 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -126,7 +126,7 @@ create_sim() {
   xcrun simctl create "$1" "$3" "$runtime" || fail "Failed to create $2 simulator for testing"
 }
 
-create_sim dataloader-tester-ios iOS com.apple.CoreSimulator.SimDeviceType.iPhone-8
+create_sim dataloader-tester-ios iOS com.apple.CoreSimulator.SimDeviceType.iPhone-XR
 
 xcb "Run tests for iOS" test \
   -scheme "ALL_TESTS" \
diff --git a/ci/spotify_os.xcconfig b/ci/spotify_os.xcconfig
index 64febae..6ca83a7 100644
--- a/ci/spotify_os.xcconfig
+++ b/ci/spotify_os.xcconfig
@@ -92,6 +92,7 @@ WARNING_CFLAGS_XCODE_1200 = $(WARNING_CFLAGS_XCODE_1100)
 WARNING_CFLAGS_XCODE_1300 = $(WARNING_CFLAGS_XCODE_1200)
 WARNING_CFLAGS_XCODE_1400 = $(WARNING_CFLAGS_XCODE_1300)
 WARNING_CFLAGS_XCODE_1500 = $(WARNING_CFLAGS_XCODE_1400)
+WARNING_CFLAGS_XCODE_1600 = $(WARNING_CFLAGS_XCODE_1500)
 
 // Warnings
 CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES