diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f0c6fce571fe5d87d529025a667dea81fe72fba..9c0d8cff6039180cf8931e10d5b0730937fe621f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,6 +121,10 @@ variables:
   variables:
     EMPER_LOG_TIMESTAMP: "false"
 
+.locked-ws-queues:
+  variables:
+    EMPER_LOCKED_WS_QUEUE: "true"
+
 test-gcc:
   extends:
     - .test
@@ -201,3 +205,8 @@ test-do-not-log-timestamp:
   extends:
     - .test
     - .do-not-log-timestamp
+
+test-locked-ws-queues:
+  extends:
+    - .test
+    - .locked-ws-queues
diff --git a/emper/strategies/AbstractWorkStealingScheduler.hpp b/emper/strategies/AbstractWorkStealingScheduler.hpp
index 6e3564fbff751295b87f32fa8462242dcbe0b5d6..ce0d378da7666a863242cd1d64233cd130e7b205 100644
--- a/emper/strategies/AbstractWorkStealingScheduler.hpp
+++ b/emper/strategies/AbstractWorkStealingScheduler.hpp
@@ -9,7 +9,12 @@
 #include "NextFiberResult.hpp"
 #include "Scheduler.hpp"
 #include "emper-common.h"
-#include "lib/adt/WsClQueue.hpp"	// for WsClQueue
+
+#ifdef EMPER_LOCKED_WS_QUEUE
+#include "lib/adt/LockedQueue.hpp"
+#else
+#include "lib/adt/WsClQueue.hpp"
+#endif
 
 class Fiber;
 class Runtime;