diff --git a/components/ocs_core/test/test_rate_limiter.cpp b/components/ocs_core/test/test_rate_limiter.cpp
index 12a3f312..1183d993 100644
--- a/components/ocs_core/test/test_rate_limiter.cpp
+++ b/components/ocs_core/test/test_rate_limiter.cpp
@@ -15,7 +15,7 @@ namespace ocs {
 namespace core {
 
 TEST_CASE("Rate limiter: allow operation to be performed", "[ocs_core], [rate_limiter]") {
-    const Time interval = second;
+    const Time interval = Duration::second;
 
     test::TestClock clock;
     clock.value = 42;
diff --git a/components/ocs_scheduler/test/test_async_task.cpp b/components/ocs_scheduler/test/test_async_task.cpp
index 64d21c5a..77f6826f 100644
--- a/components/ocs_scheduler/test/test_async_task.cpp
+++ b/components/ocs_scheduler/test/test_async_task.cpp
@@ -18,7 +18,7 @@ namespace scheduler {
 TEST_CASE("Async task: run sets event in event group", "[ocs_scheduler], [async_task]") {
     core::StaticEventGroup event_group;
 
-    const ITask::Event event = BIT(0);
+    const EventBits_t event = BIT(0);
     AsyncTask task(event_group.get(), event);
 
     // Initially, the event should not be set.
@@ -35,8 +35,8 @@ TEST_CASE("Async task: multiple runs set event correctly",
           "[ocs_scheduler], [async_task]") {
     core::StaticEventGroup event_group;
 
-    const ITask::Event event1 = BIT(0);
-    const ITask::Event event2 = BIT(1);
+    const EventBits_t event1 = BIT(0);
+    const EventBits_t event2 = BIT(1);
 
     AsyncTask task1(event_group.get(), event1);
     AsyncTask task2(event_group.get(), event2);