diff --git a/tb/.gitignore b/tb/.gitignore
index ee116f5..622ebf1 100644
--- a/tb/.gitignore
+++ b/tb/.gitignore
@@ -3,4 +3,5 @@ __pycache__/
 sim_build/
 
 *.vcd
+*.fst
 *.xml
diff --git a/tb/Makefile b/tb/Makefile
index 631ebbe..696f247 100644
--- a/tb/Makefile
+++ b/tb/Makefile
@@ -26,7 +26,7 @@ CORE_SOURCES := $(shell cat $(CORE_DIRECTORY)/Flist.$(TOPLEVEL))
 VERILOG_SOURCES = $(addprefix $(ROOT_DIRECTORY)/, $(CORE_SOURCES)) $(ITF_DIRECTORY)/simple_reg_interface.sv
 
 # Verilator extra arguments to build waves
-EXTRA_ARGS += --trace --trace-structs
+EXTRA_ARGS += --trace --trace-structs --trace-fst
 
 include $(shell cocotb-config --makefiles)/Makefile.sim
 
diff --git a/tb/interface/makefile b/tb/interface/makefile
index 4796288..0e813f6 100644
--- a/tb/interface/makefile
+++ b/tb/interface/makefile
@@ -26,7 +26,7 @@ VERILOG_SOURCES = $(ITF_DIRECTORY)/$(VERILOG_FILE)
 ITERATIONS := 10 # Number of random tests ran
 
 # Verilator extra arguments to build waves
-EXTRA_ARGS += --trace --trace-structs
+EXTRA_ARGS += --trace --trace-structs --trace-fst
 
 include $(shell cocotb-config --makefiles)/Makefile.sim
 
diff --git a/tb/interface/test_simple_interface.py b/tb/interface/test_simple_interface.py
index 5cdd60b..d5503b4 100644
--- a/tb/interface/test_simple_interface.py
+++ b/tb/interface/test_simple_interface.py
@@ -253,7 +253,7 @@ def test_interface_regs(DataWidth, BlockWidth, ByteAlign, DigestWidth):
     extra_args: List[str] = []
 
     if SIM == "verilator" and WAVES == "1":
-        extra_args = ["--trace", "--trace-structs"]
+        extra_args = ["--trace", "--trace-structs", "--trace-fst"]
 
     parameters: Dict[str, str] = {}
 
diff --git a/tb/sha1/makefile b/tb/sha1/makefile
index b55980c..8b7be0c 100644
--- a/tb/sha1/makefile
+++ b/tb/sha1/makefile
@@ -22,6 +22,6 @@ MODULE = test_sha1_core
 VERILOG_SOURCES = $(SHA_DIRECTORY)/sha1_core.sv
 
 # Verilator extra arguments to build waves
-EXTRA_ARGS += --trace --trace-structs
+EXTRA_ARGS += --trace --trace-structs --trace-fst
 
 include $(shell cocotb-config --makefiles)/Makefile.sim
diff --git a/tb/sha1/test_sha1_core.py b/tb/sha1/test_sha1_core.py
index 298b429..0d81b69 100644
--- a/tb/sha1/test_sha1_core.py
+++ b/tb/sha1/test_sha1_core.py
@@ -264,7 +264,7 @@ def test_sha1_core():
     extra_args: List[str] = []
 
     if SIM == "verilator" and WAVES == "1":
-        extra_args = ["--trace", "--trace-structs"]
+        extra_args = ["--trace", "--trace-structs", "--trace-fst"]
 
     parameters: Dict[str, str] = {}
 
diff --git a/tb/sha2/makefile b/tb/sha2/makefile
index ae6df50..defd3c9 100644
--- a/tb/sha2/makefile
+++ b/tb/sha2/makefile
@@ -22,7 +22,7 @@ MODULE = test_sha2_cores
 VERILOG_SOURCES = $(SHA_DIRECTORY)/sha256_core.sv
 
 # Verilator extra arguments to build waves
-EXTRA_ARGS += --trace --trace-structs
+EXTRA_ARGS += --trace --trace-structs --trace-fst
 
 include $(shell cocotb-config --makefiles)/Makefile.sim
 
diff --git a/tb/sha2/test_sha2_cores.py b/tb/sha2/test_sha2_cores.py
index fe3ebcf..9d560df 100644
--- a/tb/sha2/test_sha2_cores.py
+++ b/tb/sha2/test_sha2_cores.py
@@ -287,7 +287,7 @@ def test_sha256_core(core, DigestWidth):
     extra_args: List[str] = []
 
     if SIM == "verilator" and WAVES == "1":
-        extra_args = ["--trace", "--trace-structs"]
+        extra_args = ["--trace", "--trace-structs", "--trace-fst"]
 
     parameters: Dict[str, str] = {}
 
diff --git a/tb/test_tops.py b/tb/test_tops.py
index 0681d95..00d7986 100644
--- a/tb/test_tops.py
+++ b/tb/test_tops.py
@@ -373,7 +373,7 @@ def test_ip(ip, DigestWidth):
     extra_args: List[str] = []
 
     if SIM == "verilator" and WAVES == "1":
-        extra_args = ["--trace", "--trace-structs"]
+        extra_args = ["--trace", "--trace-structs", "--trace-fst"]
 
     parameters: Dict[str, str] = {}