diff --git a/forge/test/operators/utils/plan.py b/forge/test/operators/utils/plan.py
index 313ee91ff..1caf5978a 100644
--- a/forge/test/operators/utils/plan.py
+++ b/forge/test/operators/utils/plan.py
@@ -691,6 +691,8 @@ def test_id_to_test_vector(cls, test_id: str) -> TestVector:
         # As last parameter in test id is math fidelity, in case of duplicated tests numeric suffix should be ignored
         if math_fidelity_part is not None and math_fidelity_part.startswith("HiFi4"):
             math_fidelity_part = "HiFi4"
+        if math_fidelity_part is not None and math_fidelity_part.startswith("None"):
+            math_fidelity_part = None
         math_fidelity = eval(f"forge._C.{math_fidelity_part}") if math_fidelity_part is not None else None
 
         return TestVector(