diff --git a/tb/axi_adapter/test_axi_adapter.py b/tb/axi_adapter/test_axi_adapter.py
index a863103..37d5258 100644
--- a/tb/axi_adapter/test_axi_adapter.py
+++ b/tb/axi_adapter/test_axi_adapter.py
@@ -186,7 +186,7 @@ def cycle_pause():
 
 if cocotb.SIM_NAME:
 
-    data_width = int(os.getenv("PARAM_S_DATA_WIDTH"))
+    data_width = len(cocotb.top.s_axi_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()
 
diff --git a/tb/axi_axil_adapter/test_axi_axil_adapter.py b/tb/axi_axil_adapter/test_axi_axil_adapter.py
index 83e763e..2b959a2 100644
--- a/tb/axi_axil_adapter/test_axi_axil_adapter.py
+++ b/tb/axi_axil_adapter/test_axi_axil_adapter.py
@@ -186,7 +186,7 @@ def cycle_pause():
 
 if cocotb.SIM_NAME:
 
-    data_width = int(os.getenv("PARAM_AXI_DATA_WIDTH"))
+    data_width = len(cocotb.top.s_axi_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()
 
diff --git a/tb/axi_crossbar/test_axi_crossbar.py b/tb/axi_crossbar/test_axi_crossbar.py
index ff0d63a..f12e5e6 100644
--- a/tb/axi_crossbar/test_axi_crossbar.py
+++ b/tb/axi_crossbar/test_axi_crossbar.py
@@ -206,7 +206,7 @@ if cocotb.SIM_NAME:
     s_count = int(os.getenv("PARAM_S_COUNT"))
     m_count = int(os.getenv("PARAM_M_COUNT"))
 
-    data_width = int(os.getenv("PARAM_DATA_WIDTH"))
+    data_width = len(cocotb.top.s00_axi_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()
 
diff --git a/tb/axi_dp_ram/test_axi_dp_ram.py b/tb/axi_dp_ram/test_axi_dp_ram.py
index de18e5b..bd91952 100644
--- a/tb/axi_dp_ram/test_axi_dp_ram.py
+++ b/tb/axi_dp_ram/test_axi_dp_ram.py
@@ -218,7 +218,7 @@ def cycle_pause():
 
 if cocotb.SIM_NAME:
 
-    data_width = int(os.getenv("PARAM_DATA_WIDTH"))
+    data_width = len(cocotb.top.s_axi_a_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()
 
diff --git a/tb/axi_fifo/test_axi_fifo.py b/tb/axi_fifo/test_axi_fifo.py
index 578af81..992ef4e 100644
--- a/tb/axi_fifo/test_axi_fifo.py
+++ b/tb/axi_fifo/test_axi_fifo.py
@@ -187,7 +187,7 @@ def cycle_pause():
 
 if cocotb.SIM_NAME:
 
-    data_width = int(os.getenv("PARAM_DATA_WIDTH"))
+    data_width = len(cocotb.top.s_axi_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()
 
diff --git a/tb/axi_interconnect/test_axi_interconnect.py b/tb/axi_interconnect/test_axi_interconnect.py
index 32dff14..8c9b6c8 100644
--- a/tb/axi_interconnect/test_axi_interconnect.py
+++ b/tb/axi_interconnect/test_axi_interconnect.py
@@ -200,7 +200,7 @@ if cocotb.SIM_NAME:
     s_count = int(os.getenv("PARAM_S_COUNT"))
     m_count = int(os.getenv("PARAM_M_COUNT"))
 
-    data_width = int(os.getenv("PARAM_DATA_WIDTH"))
+    data_width = len(cocotb.top.s00_axi_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()
 
diff --git a/tb/axi_ram/test_axi_ram.py b/tb/axi_ram/test_axi_ram.py
index f137263..1ab752b 100644
--- a/tb/axi_ram/test_axi_ram.py
+++ b/tb/axi_ram/test_axi_ram.py
@@ -178,7 +178,7 @@ def cycle_pause():
 
 if cocotb.SIM_NAME:
 
-    data_width = int(os.getenv("PARAM_DATA_WIDTH"))
+    data_width = len(cocotb.top.s_axi_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()
 
diff --git a/tb/axi_register/test_axi_register.py b/tb/axi_register/test_axi_register.py
index 1e72163..9256cde 100644
--- a/tb/axi_register/test_axi_register.py
+++ b/tb/axi_register/test_axi_register.py
@@ -186,7 +186,7 @@ def cycle_pause():
 
 if cocotb.SIM_NAME:
 
-    data_width = int(os.getenv("PARAM_DATA_WIDTH"))
+    data_width = len(cocotb.top.s_axi_wdata)
     byte_width = data_width // 8
     max_burst_size = (byte_width-1).bit_length()