diff --git a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart
index 061b796133..eddaf1814d 100644
--- a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart
+++ b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle__benchmark.dart
@@ -9,5 +9,6 @@ import 'package:flutter_devicelab/framework/framework.dart';
 import 'package:flutter_devicelab/framework/adb.dart';
 
 Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.ios;
   await task(createHotModeTest());
 }
diff --git a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart
deleted file mode 100644
index eddaf1814d..0000000000
--- a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:flutter_devicelab/tasks/hot_mode_tests.dart';
-import 'package:flutter_devicelab/framework/framework.dart';
-import 'package:flutter_devicelab/framework/adb.dart';
-
-Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(createHotModeTest());
-}
diff --git a/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart b/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart
index ca5ff768f9..81e7edb30d 100644
--- a/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart
+++ b/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart
@@ -9,6 +9,7 @@ import 'package:flutter_devicelab/framework/adb.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
 
 Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.ios;
   // It's intended to use the Gallery startup test as a smoke test on macOS
   // Catalina.
   await task(createFlutterGalleryStartupTest());
diff --git a/dev/devicelab/bin/tasks/smoke_catalina_start_up_ios.dart b/dev/devicelab/bin/tasks/smoke_catalina_start_up_ios.dart
deleted file mode 100644
index 81e7edb30d..0000000000
--- a/dev/devicelab/bin/tasks/smoke_catalina_start_up_ios.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-
-import 'package:flutter_devicelab/tasks/perf_tests.dart';
-import 'package:flutter_devicelab/framework/adb.dart';
-import 'package:flutter_devicelab/framework/framework.dart';
-
-Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.ios;
-  // It's intended to use the Gallery startup test as a smoke test on macOS
-  // Catalina.
-  await task(createFlutterGalleryStartupTest());
-}
diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index 2b07f83ebe..2108b01dab 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml
@@ -517,32 +517,18 @@ tasks:
     stage: devicelab_ios
     required_agent_capabilities: ["mac/ios"]
 
-  smoke_catalina_start_up_ios:
-    description: >
-      A smoke test that runs on macOS Catalina, which is a clone of the Gallery startup latency test.
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac-catalina/ios"]
-
-  smoke_catalina_hot_mode_dev_cycle_ios__benchmark:
-    description: >
-      A some test that runs on macOS Catalina, which is a clone of the Dart VM hot patching performance benchmarking.
-    stage: devicelab_ios
-    flaky: true
-    required_agent_capabilities: ["mac-catalina/ios"]
-
   smoke_catalina_start_up:
     description: >
       A smoke test that runs on macOS Catalina, which is a clone of the Gallery startup latency test.
-    stage: devicelab
-    flaky: true
-    required_agent_capabilities: ["mac-catalina/android"]
+    stage: devicelab_ios
+    required_agent_capabilities: ["mac-catalina/ios"]
 
   smoke_catalina_hot_mode_dev_cycle__benchmark:
     description: >
       A some test that runs on macOS Catalina, which is a clone of the Dart VM hot patching performance benchmarking.
-    stage: devicelab
+    stage: devicelab_ios
     flaky: true
-    required_agent_capabilities: ["mac-catalina/android"]
+    required_agent_capabilities: ["mac-catalina/ios"]
 
   # Tests running on Windows host