diff --git a/test-kit/src/main/scala/chess/CoreArbitraries.scala b/test-kit/src/main/scala/chess/CoreArbitraries.scala
index 825fcc20..a5f7a0b8 100644
--- a/test-kit/src/main/scala/chess/CoreArbitraries.scala
+++ b/test-kit/src/main/scala/chess/CoreArbitraries.scala
@@ -3,7 +3,7 @@ package chess
 import chess.bitboard.Bitboard
 import chess.format.pgn.{ Glyph, Glyphs }
 import chess.format.{ Uci, UciCharPair }
-import chess.variant.Variant
+import chess.variant.{ Crazyhouse, Variant }
 import org.scalacheck.{ Arbitrary, Cogen, Gen }
 
 object CoreArbitraries:
@@ -28,6 +28,8 @@ object CoreArbitraries:
   given Arbitrary[Castles]  = Arbitrary(castlesGen)
   given Arbitrary[Bitboard] = Arbitrary(Gen.long.map(Bitboard(_)))
 
+  given Arbitrary[PromotableRole] = Arbitrary(Gen.oneOf(Rook, Knight, Bishop, Queen))
+
   given Arbitrary[Uci] = Arbitrary(Gen.oneOf(normalUciMoveGen, promotionUciMoveGen, dropUciMoveGen))
 
   given Cogen[Color]  = Cogen.cogenBoolean.contramap(_.white)
@@ -40,6 +42,21 @@ object CoreArbitraries:
       b <- Arbitrary.arbitrary[A]
     yield ByColor(w, b)
 
+  given Arbitrary[Crazyhouse.Pocket] = Arbitrary:
+    for
+      pawn   <- Gen.oneOf(0 to 8)
+      knight <- Gen.oneOf(0 to 2)
+      bishop <- Gen.oneOf(0 to 2)
+      rook   <- Gen.oneOf(0 to 2)
+      queen  <- Gen.oneOf(0 to 2)
+    yield Crazyhouse.Pocket(pawn, knight, bishop, rook, queen)
+
+  given Arbitrary[Crazyhouse.Data] = Arbitrary:
+    for
+      pockets  <- Arbitrary.arbitrary[ByColor[Crazyhouse.Pocket]]
+      promoted <- Arbitrary.arbitrary[Bitboard]
+    yield Crazyhouse.Data(pockets, promoted)
+
   def normalUciMoveGen =
     for
       orig <- Arbitrary.arbitrary[Square]