diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp
index 4b626dff..ccf532d7 100644
--- a/test/camera/buffer_import.cpp
+++ b/test/camera/buffer_import.cpp
@@ -17,6 +17,7 @@
 
 #include "libcamera/internal/device_enumerator.h"
 #include "libcamera/internal/media_device.h"
+#include "libcamera/internal/thread.h"
 #include "libcamera/internal/v4l2_videodevice.h"
 
 #include "buffer_source.h"
@@ -131,7 +132,7 @@ protected:
 			}
 		}
 
-		EventDispatcher *dispatcher = cm_->eventDispatcher();
+		EventDispatcher *dispatcher = Thread::current()->eventDispatcher();
 
 		Timer timer;
 		timer.start(1000);
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index f13ca53b..fd5292b7 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -11,6 +11,8 @@
 #include <libcamera/framebuffer_allocator.h>
 #include <libcamera/timer.h>
 
+#include "libcamera/internal/thread.h"
+
 #include "camera_test.h"
 #include "test.h"
 
@@ -131,7 +133,7 @@ protected:
 			}
 		}
 
-		EventDispatcher *dispatcher = cm_->eventDispatcher();
+		EventDispatcher *dispatcher = Thread::current()->eventDispatcher();
 
 		Timer timer;
 		timer.start(1000);