diff --git a/src/peakrdl_regblock/cpuif/obi/obi_tmpl.sv b/src/peakrdl_regblock/cpuif/obi/obi_tmpl.sv
index 8f276cb..37c0575 100644
--- a/src/peakrdl_regblock/cpuif/obi/obi_tmpl.sv
+++ b/src/peakrdl_regblock/cpuif/obi/obi_tmpl.sv
@@ -44,7 +44,11 @@ always_ff {{get_always_ff_event(cpuif.reset)}} begin
                 is_active <= 1'b1;
                 cpuif_req <= 1'b1;
                 cpuif_req_is_wr <= {{cpuif.signal("we")}};
+                {%- if cpuif.data_width_bytes == 1 %}
+                cpuif_addr <= {{cpuif.signal("addr")}}[{{cpuif.addr_width-1}}:0];
+                {%- else %}
                 cpuif_addr <= { {{-cpuif.signal("addr")}}[{{cpuif.addr_width-1}}:{{clog2(cpuif.data_width_bytes)}}], {{clog2(cpuif.data_width_bytes)}}'b0};
+                {%- endif %}
                 cpuif_wr_data <= {{cpuif.signal("wdata")}};
                 rid_q <= {{cpuif.signal("aid")}};
                 for (int i = 0; i < {{cpuif.data_width_bytes}}; i++) begin
diff --git a/tests/test_read_fanin/testcase.py b/tests/test_read_fanin/testcase.py
index 03a077f..d38b933 100644
--- a/tests/test_read_fanin/testcase.py
+++ b/tests/test_read_fanin/testcase.py
@@ -1,9 +1,11 @@
 from parameterized import parameterized_class
 
+from ..lib.cpuifs import ALL_CPUIF
 from ..lib.sim_testcase import SimTestCase
 from ..lib.test_params import get_permutation_class_name, get_permutations
 
 PARAMS = get_permutations({
+    "cpuif": ALL_CPUIF,
     "regwidth" : [8, 16, 32, 64],
 })
 @parameterized_class(PARAMS, class_name_func=get_permutation_class_name)