diff --git a/riscof/framework/test.py b/riscof/framework/test.py
index 3141d3d..323bbc0 100644
--- a/riscof/framework/test.py
+++ b/riscof/framework/test.py
@@ -261,7 +261,7 @@ def isa_set(string):
 def canonicalise(isa):
     all_ext = ["M","A","F","D","Q","L","C","B","J","K","T","P","V","N","S","H","U","Zicsr",
             "Zifencei","Zihintpause","Zmmul","Zam","Zba","Zbc","Zbb","Zbs","Zbp","Zbm","Zbe","Zbf","Zkne",
-            "Zknd","Zknh","Zkse","Zksh","Zkg","Zkb","Zkr","Zks","Zkn","Ztso","Zbkb","Zbkc","Zbkx"]
+            "Zknd","Zknh","Zkse","Zksh","Zkg","Zkb","Zkr","Zks","Zkn","Ztso","Zbkb","Zbkc","Zbkx", "Zfh"]
     canonical_string = ""
     switch = False
     for ext in all_ext:
@@ -368,7 +368,9 @@ def generate_test_pool(ispec, pspec, workdir, dbfile = None):
             elif '128' in isa:
                 xlen = '128'
             macros.append("XLEN=" + xlen)
-            if re.match(r"^[^(Z,z)]+D.*$",isa):
+            if re.match(r"^[^(Z,z)]+Zfh.*$",isa):
+                macros.append("FLEN=16")
+            elif re.match(r"^[^(Z,z)]+D.*$",isa):
                 macros.append("FLEN=64")
             elif re.match(r"^[^(Z,z)]+F.*$",isa):
                 macros.append("FLEN=32")