diff --git a/node/subsystem-test-helpers/src/lib.rs b/node/subsystem-test-helpers/src/lib.rs
index 624b0af73d55..f014b281a81a 100644
--- a/node/subsystem-test-helpers/src/lib.rs
+++ b/node/subsystem-test-helpers/src/lib.rs
@@ -318,10 +318,14 @@ pub struct ForwardSubsystem<M>(pub mpsc::Sender<M>);
 
 impl<M, Context> overseer::Subsystem<Context, SubsystemError> for ForwardSubsystem<M>
 where
-	M: std::fmt::Debug + Send + 'static,
+	M: overseer::AssociateOutgoing + std::fmt::Debug + Send + 'static,
 	Context:
-		overseer::SubsystemContext<Message = M, Signal = OverseerSignal, Error = SubsystemError>,
-	<Context as overseer::SubsystemContext>::OutgoingMessages: From<M> + Send,
+		overseer::SubsystemContext<
+			Message = M,
+			Signal = OverseerSignal,
+			Error = SubsystemError,
+			OutgoingMessages = < M as overseer::AssociateOutgoing>::OutgoingMessages,
+		>,
 {
 	fn start(mut self, mut ctx: Context) -> SpawnedSubsystem {
 		let future = Box::pin(async move {
diff --git a/node/subsystem-util/src/tests.rs b/node/subsystem-util/src/tests.rs
index 180cb384e2ca..12c9e21220d2 100644
--- a/node/subsystem-util/src/tests.rs
+++ b/node/subsystem-util/src/tests.rs
@@ -60,10 +60,10 @@ enum Error {
 
 impl<Sender> JobTrait for FakeCollatorProtocolJob<Sender>
 where
-	Sender: overseer::CollatorProtocolSender,
+	Sender: overseer::CollatorProtocolSenderTrait + std::marker::Unpin,
 {
-	type Consumes = CollatorProtocolMessage;
-	type OutgoingMessages = CollatorProtocolOutgoingMessages;
+	type ToJob = CollatorProtocolMessage;
+	type OutgoingMessages = overseer::CollatorProtocolOutgoingMessages;
 	type Sender = Sender;
 	type Error = Error;
 	type RunArgs = bool;
@@ -102,7 +102,10 @@ where
 	}
 }
 
-impl FakeCollatorProtocolJob {
+impl<Sender> FakeCollatorProtocolJob<Sender>
+where
+	Sender: overseer::CollatorProtocolSenderTrait,
+{
 	async fn run_loop(mut self) -> Result<(), Error> {
 		loop {
 			match self.receiver.next().await {