diff --git a/src/ibek/runtime_cmds/commands.py b/src/ibek/runtime_cmds/commands.py
index 867b1d191..d8f6593fc 100644
--- a/src/ibek/runtime_cmds/commands.py
+++ b/src/ibek/runtime_cmds/commands.py
@@ -100,7 +100,8 @@ def generate_pvi(ioc: IOC) -> Tuple[List[IndexEntry], List[Tuple[Database, Entit
             device.deserialize_parents([PVI_DEFS])
 
             # render the prefix value for the device from the instance parameters
-            prefix_value = render_with_utils(entity, entity_pvi.prefix)
+            entity_dict = entity.model_dump()
+            prefix_value = render_with_utils(entity_dict, entity_pvi.prefix)
 
             macros = {"prefix": prefix_value}
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 5ccfd7311..fbef72a56 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,7 +1,5 @@
 import os
-import shutil
 from pathlib import Path
-from typing import List
 
 from pytest import fixture
 from ruamel.yaml import YAML
@@ -10,7 +8,6 @@
 os.environ["EPICS_ROOT"] = str(Path(__file__).parent / "samples" / "epics")
 
 from ibek.__main__ import cli  # noqa: E402
-from ibek.globals import PVI_DEFS  # noqa: E402
 from ibek.ioc import clear_entity_model_ids, make_entity_models  # noqa: E402
 from ibek.support import Support  # noqa: E402