diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 32c294b7f..bfb6aa0bb 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
             target: thumbv7em-none-eabi
           - package: embassy
             target: thumbv7em-none-eabi
-            features: log
+            features: log,executor-agnostic
           - package: embassy
             target: thumbv7em-none-eabi
             features: defmt
diff --git a/embassy/src/util/waker_agnostic.rs b/embassy/src/util/waker_agnostic.rs
index 53f1ec135..f43cc8c33 100644
--- a/embassy/src/util/waker_agnostic.rs
+++ b/embassy/src/util/waker_agnostic.rs
@@ -2,7 +2,7 @@ use core::cell::Cell;
 use core::mem;
 use core::task::Waker;
 
-use cortex_m::interrupt::Mutex;
+use crate::util::CriticalSectionMutex as Mutex;
 
 /// Utility struct to register and wake a waker.
 #[derive(Debug)]