diff --git a/test/kcas_data/dune b/test/kcas_data/dune
index c620d0bd..92b75f60 100644
--- a/test/kcas_data/dune
+++ b/test/kcas_data/dune
@@ -17,6 +17,7 @@
   lru_cache_example
   mvar_test
   queue_test
+  queue_test_stm
   stack_test
   stack_test_stm
   xt_test)
diff --git a/test/kcas_data/queue_test_stm.ml b/test/kcas_data/queue_test_stm.ml
new file mode 100644
index 00000000..d3b0174e
--- /dev/null
+++ b/test/kcas_data/queue_test_stm.ml
@@ -0,0 +1,68 @@
+open QCheck
+open STM
+open Kcas_data
+
+module Spec = struct
+  type cmd = Push of int | Take_opt | Peek_opt | Length
+
+  let show_cmd = function
+    | Push x -> "Push " ^ string_of_int x
+    | Take_opt -> "Take_opt"
+    | Peek_opt -> "Peek_opt"
+    | Length -> "Length"
+
+  module State = struct
+    type t = int list * int list
+
+    let push x (h, t) = if h == [] then ([ x ], []) else (h, x :: t)
+    let peek_opt (h, _) = match h with x :: _ -> Some x | [] -> None
+
+    let drop ((h, t) as s) =
+      match h with [] -> s | [ _ ] -> (List.rev t, []) | _ :: h -> (h, t)
+
+    let length (h, t) = List.length h + List.length t
+  end
+
+  type state = State.t
+  type sut = int Queue.t
+
+  let arb_cmd _s =
+    [
+      Gen.int |> Gen.map (fun x -> Push x);
+      Gen.return Take_opt;
+      Gen.return Peek_opt;
+      Gen.return Length;
+    ]
+    |> Gen.oneof |> make ~print:show_cmd
+
+  let init_state = ([], [])
+  let init_sut () = Queue.create ()
+  let cleanup _ = ()
+
+  let next_state c s =
+    match c with
+    | Push x -> State.push x s
+    | Take_opt -> State.drop s
+    | Peek_opt -> s
+    | Length -> s
+
+  let precond _ _ = true
+
+  let run c d =
+    match c with
+    | Push x -> Res (unit, Queue.push x d)
+    | Take_opt -> Res (option int, Queue.take_opt d)
+    | Peek_opt -> Res (option int, Queue.peek_opt d)
+    | Length -> Res (int, Queue.length d)
+
+  let postcond c (s : state) res =
+    match (c, res) with
+    | Push _x, Res ((Unit, _), ()) -> true
+    | Take_opt, Res ((Option Int, _), res) -> res = State.peek_opt s
+    | Peek_opt, Res ((Option Int, _), res) -> res = State.peek_opt s
+    | Length, Res ((Int, _), res) -> res = State.length s
+    | _, _ -> false
+end
+
+let () =
+  Stm_run.run ~count:1000 ~verbose:true ~name:"Queue" (module Spec) |> exit