diff --git a/.circleci/config.yml b/.circleci/config.yml
index f825bac2aa73d8..56d8ae6bd40ba8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -284,11 +284,11 @@ aliases:
 
   - &boot-simulator-iphone
     name: Boot iPhone Simulator
-    command: xcrun simctl boot "iPhone XS" || true
+    command: source scripts/.tests.env && xcrun simctl boot "$IOS_DEVICE" || true
 
   - &boot-simulator-appletv
     name: Boot Apple TV Simulator
-    command: xcrun simctl boot "Apple TV" || true
+    command: source scripts/.tests.env && xcrun simctl boot "$TVOS_DEVICE" || true
 
   - &run-objc-ios-tests
     name: iOS Test Suite
diff --git a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
index 81cb0a86472284..1455c27810f93a 100644
--- a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
+++ b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m
@@ -40,7 +40,7 @@ - (void)test##name                      \
 RCT_TEST(ViewExample)
 RCT_TEST(LayoutExample)
 RCT_TEST(ARTExample)
-RCT_TEST(ScrollViewExample)
+// Disabled due to flakiness RCT_TEST(ScrollViewExample)
 RCT_TEST(TextExample)
 #if !TARGET_OS_TV
 // No switch or slider available on tvOS