diff --git a/test/tb_floo_axi_chimney.sv b/test/tb_floo_axi_chimney.sv
index a9d85932..21a03edd 100644
--- a/test/tb_floo_axi_chimney.sv
+++ b/test/tb_floo_axi_chimney.sv
@@ -22,6 +22,8 @@ module tb_floo_axi_chimney;
   localparam NumReads1 = 1000;
   localparam NumWrites1 = 1000;
 
+  localparam bit AtopSupport = 1'b1;
+
   localparam NumTargets = 2;
 
   localparam int unsigned ReorderBufferSize = 64;
@@ -79,7 +81,7 @@ module tb_floo_axi_chimney;
     .slv_rsp_t      ( axi_out_rsp_t       ),
     .ApplTime       ( ApplTime            ),
     .TestTime       ( TestTime            ),
-    .Atops          ( 1'b1                ),
+    .Atops          ( AtopSupport         ),
     .AxiMaxBurstLen ( ReorderBufferSize   ),
     .NumAddrRegions ( NumAddrRegions      ),
     .rule_t         ( node_addr_region_t  ),
@@ -116,7 +118,7 @@ module tb_floo_axi_chimney;
   );
 
   floo_axi_chimney #(
-    .AtopSupport        ( 1'b1                ),
+    .AtopSupport        ( AtopSupport         ),
     .MaxAtomicTxns      ( 4                   ),
     .RouteAlgo          ( floo_pkg::IdTable   ),
     .MaxTxns            ( MaxTxns             ),
@@ -140,7 +142,7 @@ module tb_floo_axi_chimney;
   );
 
   floo_axi_chimney #(
-    .AtopSupport        ( 1'b1                ),
+    .AtopSupport        ( AtopSupport         ),
     .MaxAtomicTxns      ( 4                   ),
     .RouteAlgo          ( floo_pkg::IdTable   ),
     .MaxTxns            ( MaxTxns             ),
@@ -189,12 +191,12 @@ module tb_floo_axi_chimney;
     .AxiIdOutWidth  ( AxiInIdWidth        ),
     .AxiUserWidth   ( AxiInUserWidth      ),
     .mst_req_t      ( axi_in_req_t        ),
-    .mst_rsp_t      ( axi_in_rsp_t       ),
+    .mst_rsp_t      ( axi_in_rsp_t        ),
     .slv_req_t      ( axi_out_req_t       ),
-    .slv_rsp_t      ( axi_out_rsp_t      ),
+    .slv_rsp_t      ( axi_out_rsp_t       ),
     .ApplTime       ( ApplTime            ),
     .TestTime       ( TestTime            ),
-    .Atops          ( 1'b1                ),
+    .Atops          ( AtopSupport         ),
     .AxiMaxBurstLen ( ReorderBufferSize   ),
     .NumAddrRegions ( NumAddrRegions      ),
     .rule_t         ( node_addr_region_t  ),