diff --git a/agent/test/unit/com/thoughtworks/go/agent/AgentWebSocketClientControllerTest.java b/agent/test/unit/com/thoughtworks/go/agent/AgentWebSocketClientControllerTest.java
index <HASH>..<HASH> 100644
--- a/agent/test/unit/com/thoughtworks/go/agent/AgentWebSocketClientControllerTest.java
+++ b/agent/test/unit/com/thoughtworks/go/agent/AgentWebSocketClientControllerTest.java
@@ -102,8 +102,8 @@ public class AgentWebSocketClientControllerTest {
     @After
     public void tearDown() {
         GuidService.deleteGuid();
-        System.clearProperty("go.agent.websocket.enabled");
-        System.clearProperty("go.agent.console.logs.websocket.enabled");
+        System.clearProperty(SystemEnvironment.WEBSOCKET_ENABLED.propertyName());
+        System.clearProperty(SystemEnvironment.CONSOLE_LOGS_THROUGH_WEBSOCKET_ENABLED.propertyName());
     }
 
     @Test
Change the way we clear system property so keys aren't duplicated in test