diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala
index 62f101f59f7548b9d611b51cff3298e53bdfe4ee..c0e9799171a058190bc3ba39f90e0497231ffc77 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/ChaChaBlockTest.scala
@@ -90,6 +90,8 @@ class ChaChaBlockTest extends FlatSpec with ChiselScalatestTester {
     }
   }
 
+  behavior of "The ChaCha Block Function"
+
   it should "compute RFC8439 2.3.2 test vector correctly" in
     test(new ChaChaBlock)(doTest(_, rfc8439232TestVector))
 
diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala
index 18184e37b775646266de77a59b1bcffc573376c6..6638385fcfee24211d44168309ea7e538dbf858a 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/DataMemoryTest.scala
@@ -12,6 +12,8 @@ class DataMemoryTest extends FlatSpec with ChiselScalatestTester {
   private val dataWidth = 16
   private val size = 32
 
+  behavior of "The Data Memory"
+
   it should "store some values" in {
     test(new DataMemory(addrWidth, dataWidth, size)) { c =>
       c.io.write.addr.poke("h01".U(addrWidth.W))
diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala
index 118d9023b75bf6358e77ba1f2860533f743f1bde..99f45719162ab0150a995899f8465d2ff2e76c28 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/ProgramMemoryTest.scala
@@ -36,6 +36,8 @@ class ProgramMemoryTest extends FlatSpec with ChiselScalatestTester {
     pm.reset.poke(false.B)
   }
 
+  behavior of "The Program Memory"
+
   it should "be writable and readable as PC increments" in {
     test(new ProgramMemory(addrWidth, cwWidth, size)) { c =>
       c.io.br.abs.poke(false.B)
diff --git a/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala b/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala
index e1821bee9d548e78ed7e2b8fd18dc84df38ac260..10a0238265116ab4bc605a279d57dc948994cff7 100644
--- a/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala
+++ b/src/test/scala/uk/ac/soton/ecs/can/core/QuarterRoundTest.scala
@@ -8,6 +8,8 @@ import chiseltest._
 import chisel3._
 
 class QuarterRoundTest extends FlatSpec with ChiselScalatestTester {
+  behavior of "The ChaCha Quarter Round Function"
+
   it should "compute RFC8439 2.1.1 test vector correctly" in {
     test(new QuarterRound) { c =>
       c.io.in(0).poke("h11111111".U(32.W))