diff --git a/src/bin/scheduler/setup/steps/api.rs b/src/bin/scheduler/setup/steps/api.rs
index b2ed997e..c58e3b11 100644
--- a/src/bin/scheduler/setup/steps/api.rs
+++ b/src/bin/scheduler/setup/steps/api.rs
@@ -29,7 +29,7 @@ impl SetupStep for SetupStepSuccess {
     }
 }
 
-pub fn skip(plans: Vec<Plan>) -> (Box<dyn SetupStep>, Vec<Plan>) {
+pub fn skip(plans: Vec<Plan>) -> StepWithPlans {
     (Box::new(SetupStepSuccess {}), plans)
 }
 
diff --git a/src/bin/scheduler/setup/steps/run.rs b/src/bin/scheduler/setup/steps/run.rs
index dd8ff1fc..fbb9372a 100644
--- a/src/bin/scheduler/setup/steps/run.rs
+++ b/src/bin/scheduler/setup/steps/run.rs
@@ -1,4 +1,4 @@
-use super::api::{run_steps, SetupStep};
+use super::api::{run_steps, StepWithPlans};
 use super::{directories, rcc};
 use crate::internal_config::{sort_plans_by_grouping, GlobalConfig, Plan};
 use robotmk::results::SetupFailure;
@@ -27,7 +27,7 @@ pub fn run(
     Ok((plans, failures))
 }
 
-type Gatherer = fn(&GlobalConfig, Vec<Plan>) -> Vec<(Box<dyn SetupStep>, Vec<Plan>)>;
+type Gatherer = fn(&GlobalConfig, Vec<Plan>) -> Vec<StepWithPlans>;
 #[cfg(unix)]
 type Steps = [Gatherer; 10];
 #[cfg(windows)]