diff --git a/riscof/framework/test.py b/riscof/framework/test.py
index 87df14e..77c87b3 100644
--- a/riscof/framework/test.py
+++ b/riscof/framework/test.py
@@ -373,8 +373,10 @@ def generate_test_pool(ispec, pspec, workdir, dbfile = None):
                 macros.append("FLEN=64")
             elif re.match(r"^[^(Z,z)]+F.*$",isa):
                 macros.append("FLEN=32")
-            if 'Zicbo' in ispec['ISA']:
-                macros.append("BLOCKSZ="+str(ispec['cache_block_sz']))
+            if 'cbozero' in file:
+                macros.append("BLOCKSZ="+str(pspec['zicbo_cache_block_sz']['zicboz_sz']))
+            elif 'cbo' in file:
+                macros.append("BLOCKSZ="+str(pspec['zicbo_cache_block_sz']['zicbom_sz']))
             test_pool.append(
                 (file, db[file]['commit_id'], macros,isa,cov_labels))
     logger.info("Selecting Tests.")