diff --git a/.ci/scripts/build_all_packages_app.sh b/.ci/scripts/build_all_packages_app.sh
old mode 100644
new mode 100755
diff --git a/.ci/scripts/create_all_packages_app.sh b/.ci/scripts/create_all_packages_app.sh
old mode 100644
new mode 100755
diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh
old mode 100644
new mode 100755
diff --git a/.ci/scripts/dart_unit_tests_win32.sh b/.ci/scripts/dart_unit_tests_win32.sh
old mode 100644
new mode 100755
diff --git a/.ci/scripts/drive_examples_win32.sh b/.ci/scripts/drive_examples_win32.sh
old mode 100644
new mode 100755
diff --git a/.ci/scripts/plugin_tools_tests.sh b/.ci/scripts/plugin_tools_tests.sh
old mode 100644
new mode 100755
diff --git a/.cirrus.yml b/.cirrus.yml
index 8142aae22a..4f6cf53b7a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -340,6 +340,11 @@ task:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
+      # Create an iPhone 13, to match what is available on LUCI, since Pigeon tests
+      # currently have a hard-coded device.
+      create_simulator_script:
+        - xcrun simctl list
+        - xcrun simctl create "iPhone 13" com.apple.CoreSimulator.SimDeviceType.iPhone-13 com.apple.CoreSimulator.SimRuntime.iOS-16-0
       local_tests_script:
         # script/configs/linux_only_custom_test.yaml
         #   Custom tests need Chrome for these packages. (They run in linux-custom_package_tests)
diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart
index 14ff2cf7d7..dab54247a3 100644
--- a/packages/pigeon/tool/run_tests.dart
+++ b/packages/pigeon/tool/run_tests.dart
@@ -49,7 +49,6 @@ Future<void> main(List<String> args) async {
   // separation. See https://github.com/flutter/flutter/issues/120231.
   const List<String> macOSHostLuciTests = <String>[
     iOSObjCUnitTests,
-    iOSSwiftUnitTests,
     // TODO(stuartmorgan): Enable by default once CI issues are solved; see
     // https://github.com/flutter/packages/pull/2816.
     //iOSObjCIntegrationTests,
@@ -60,6 +59,7 @@ Future<void> main(List<String> args) async {
     // iOSSwiftIntegrationTests,
   ];
   const List<String> macOSHostCirrusTests = <String>[
+    iOSSwiftUnitTests,
     macOSSwiftUnitTests,
     macOSSwiftIntegrationTests,
   ];
diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart
index a62b70ba9c..8982f8f85a 100644
--- a/packages/pigeon/tool/shared/test_suites.dart
+++ b/packages/pigeon/tool/shared/test_suites.dart
@@ -303,7 +303,7 @@ Future<int> _runIOSPluginUnitTests(String testPluginPath) async {
   return runXcodeBuild(
     '$examplePath/ios',
     sdk: 'iphonesimulator',
-    destination: 'platform=iOS Simulator,name=iPhone 8',
+    destination: 'platform=iOS Simulator,name=iPhone 13',
     extraArguments: <String>['test'],
   );
 }