diff --git a/pyproject.toml b/pyproject.toml
index d3bbaf2..1ea6b01 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,13 +41,13 @@ classifiers = [
 ]
 
 dependencies = [
-  "pcaspy@git+https://github.com/ISISComputingGroup/pcaspy",
+  "pcaspy",
   "genie-python[plot]",
-    "CaChannel@git+https://github.com/ISISComputingGroup/CaChannel.git",
-    "mock",
-    "parameterized",
-    "pysnmp",
-    "PyHamcrest"
+  "CaChannel",
+  "mock",
+  "parameterized",
+  "pysnmp",
+  "PyHamcrest"
 ]
 
 [project.optional-dependencies]
diff --git a/src/server_common/test_modules/test_channel_access.py b/src/server_common/test_modules/test_channel_access.py
index d83bb17..83398aa 100644
--- a/src/server_common/test_modules/test_channel_access.py
+++ b/src/server_common/test_modules/test_channel_access.py
@@ -4,7 +4,7 @@
 from concurrent.futures import wait
 from queue import Empty, Queue
 
-from hamcrest import *
+from hamcrest import assert_that, greater_than, has_length, is_, less_than_or_equal_to, none
 
 from server_common.channel_access import (
     NUMBER_OF_CAPUT_THREADS,
@@ -18,6 +18,13 @@
 thread_calls = Queue()
 
 
+try:
+    # Changed after CaChannel commit a112650d829138fbf63681772943a547215bdfb6
+    LOLO_ALARM_STATUS = AlarmStatus.LoLo
+except AttributeError:
+    LOLO_ALARM_STATUS = AlarmStatus.Lolo
+
+
 def set_pv_value(*args, **kwargs):
     """Mock method with set pv value signature, must take some time to work"""
     thread_calls.put((args, kwargs))
@@ -132,7 +139,7 @@ def test_GIVEN_none_and_minor_WHEN_get_THEN_minor_returned(self):
     def test_GIVEN_no_and_minor_major_WHEN_get_THEN_major_returned(self):
         no_alarms = (AlarmSeverity.No, AlarmStatus.No)
         minor_alarm = (AlarmSeverity.Minor, AlarmStatus.Low)
-        major_alarm = (AlarmSeverity.Major, AlarmStatus.Lolo)
+        major_alarm = (AlarmSeverity.Major, LOLO_ALARM_STATUS)
         result = maximum_severity(minor_alarm, major_alarm, no_alarms)
 
         assert_that(result, is_(major_alarm))
@@ -140,7 +147,7 @@ def test_GIVEN_no_and_minor_major_WHEN_get_THEN_major_returned(self):
     def test_GIVEN_no_minor_major_and_invalid_WHEN_get_THEN_invalid_returned(self):
         no_alarms = (AlarmSeverity.No, AlarmStatus.No)
         minor_alarm = (AlarmSeverity.Minor, AlarmStatus.Low)
-        major_alarm = (AlarmSeverity.Major, AlarmStatus.Lolo)
+        major_alarm = (AlarmSeverity.Major, LOLO_ALARM_STATUS)
         invalid_alarm = (AlarmSeverity.Invalid, AlarmStatus.Timeout)
         result = maximum_severity(minor_alarm, invalid_alarm, major_alarm, no_alarms)