diff --git a/tests/heliox.py b/tests/heliox.py
index 23b00e13..cf9e97e6 100644
--- a/tests/heliox.py
+++ b/tests/heliox.py
@@ -2,7 +2,7 @@
 import unittest
 from contextlib import contextmanager
 
-from genie_python.genie import PVValue
+from ibex_non_ca_helpers.typing import PVValue
 from parameterized import parameterized
 
 from utils.channel_access import ChannelAccess
diff --git a/utils/channel_access.py b/utils/channel_access.py
index c3df3309..c9cb3b08 100644
--- a/utils/channel_access.py
+++ b/utils/channel_access.py
@@ -12,12 +12,12 @@
 from contextlib import contextmanager
 from functools import partial, partialmethod
 
-from genie_python.genie import PVValue
 from genie_python.genie_cachannel_wrapper import (
     CaChannelWrapper,
     UnableToConnectToPVException,
 )
 from genie_python.genie_p4p_wrapper import P4PWrapper
+from ibex_non_ca_helpers.typing import PVValue
 
 from utils.formatters import format_value
 
@@ -305,7 +305,7 @@ def _wrapper(message: str) -> str | None:
                 return None
             else:
                 return "Exception date time: {}{}{}{}{}".format(
-                    datetime.datetime.now(tz=datetime.timezone.utc),
+                    datetime.datetime.now(tz=datetime.UTC),
                     os.linesep,
                     message,
                     os.linesep,
@@ -643,7 +643,7 @@ def assert_that_pv_exists(self, pv: str, timeout: float | None = None) -> None:
             # Last try.
             if not self.ca.pv_exists(pv, timeout=1.0):
                 raise AssertionError(
-                    f"Exception date time: {datetime.datetime.now(tz=datetime.timezone.utc)}\n"
+                    f"Exception date time: {datetime.datetime.now(tz=datetime.UTC)}\n"
                     f"PV {pv} does not exist after {timeout} seconds"
                 )