diff --git a/tests/os/linux/snmp-connector/arp-connector.robot b/tests/os/linux/snmp-connector/arp-connector.robot
index d074cd962..3ccdcf691 100644
--- a/tests/os/linux/snmp-connector/arp-connector.robot
+++ b/tests/os/linux/snmp-connector/arp-connector.robot
@@ -3,8 +3,8 @@ Documentation       Check arp table
 
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Start Connector
-Suite Teardown      Stop Connector
+Suite Setup         Ctn Generic Suite Setup
+Suite Teardown      Ctn Stop Connector
 Test Timeout        120s
 
 
diff --git a/tests/os/linux/snmp-connector/cpu-connector.robot b/tests/os/linux/snmp-connector/cpu-connector.robot
index d020ad971..c75c3d408 100644
--- a/tests/os/linux/snmp-connector/cpu-connector.robot
+++ b/tests/os/linux/snmp-connector/cpu-connector.robot
@@ -4,8 +4,8 @@ Documentation       Check cpu table
 
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Start Connector
-Suite Teardown      Stop Connector
+Suite Setup         Ctn Generic Suite Setup
+Suite Teardown      Ctn Stop Connector
 Test Timeout        120s
 
 *** Variables ***
diff --git a/tests/os/linux/snmp-connector/list-diskspath-connector.robot b/tests/os/linux/snmp-connector/list-diskspath-connector.robot
index 1efbc7db8..185b743e4 100644
--- a/tests/os/linux/snmp-connector/list-diskspath-connector.robot
+++ b/tests/os/linux/snmp-connector/list-diskspath-connector.robot
@@ -3,8 +3,8 @@ Documentation       Check list-diskspath table
 
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Start Connector
-Suite Teardown      Stop Connector
+Suite Setup         Ctn Generic Suite Setup
+Suite Teardown      Ctn Stop Connector
 Test Timeout        120s
 
 
diff --git a/tests/os/linux/snmp-connector/list-interfaces-connector.robot b/tests/os/linux/snmp-connector/list-interfaces-connector.robot
index 67ef651c1..68b382537 100644
--- a/tests/os/linux/snmp-connector/list-interfaces-connector.robot
+++ b/tests/os/linux/snmp-connector/list-interfaces-connector.robot
@@ -3,8 +3,8 @@ Documentation       Check list-interfaces table
 
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Start Connector
-Suite Teardown      Stop Connector
+Suite Setup         Ctn Generic Suite Setup
+Suite Teardown      Ctn Stop Connector
 Test Timeout        120s
 
 
diff --git a/tests/os/linux/snmp-connector/swap-connector.robot b/tests/os/linux/snmp-connector/swap-connector.robot
index eda056407..c0a0f419a 100644
--- a/tests/os/linux/snmp-connector/swap-connector.robot
+++ b/tests/os/linux/snmp-connector/swap-connector.robot
@@ -3,8 +3,8 @@ Documentation       Check swap table
 
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Start Connector
-Suite Teardown      Stop Connector
+Suite Setup         Ctn Generic Suite Setup
+Suite Teardown      Ctn Stop Connector
 Test Timeout        120s
 
 
diff --git a/tests/os/linux/snmp-connector/time-connector.robot b/tests/os/linux/snmp-connector/time-connector.robot
index a40df02e6..3ac7a7740 100644
--- a/tests/os/linux/snmp-connector/time-connector.robot
+++ b/tests/os/linux/snmp-connector/time-connector.robot
@@ -2,8 +2,8 @@
 Documentation       Check time table
 Resource            ${CURDIR}${/}..${/}..${/}..${/}resources/import.resource
 
-Suite Setup         Start Connector
-Suite Teardown      Stop Connector
+Suite Setup         Ctn Generic Suite Setup
+Suite Teardown      Ctn Stop Connector
 Test Timeout        120s
 
 
diff --git a/tests/resources/connector.py b/tests/resources/connector.py
index dffb36a1d..703b36a0f 100644
--- a/tests/resources/connector.py
+++ b/tests/resources/connector.py
@@ -125,7 +125,6 @@ def ctn_clean_connector_output(line):
         line = str(line)
     line = line.strip()
     print(f"CLEAN DEBUG RAW: {repr(line)}")  # This will show hidden chars
-    # If 'OK:' is in the line, just return everything from 'OK:' onward!
     idx = line.find("OK:")
     if idx != -1:
         cleaned = line[idx:]