diff --git a/tests/security/test_ssl.robot b/security/test_ssl.robot
similarity index 86%
rename from tests/security/test_ssl.robot
rename to security/test_ssl.robot
index b5f0a96..d909e7a 100644
--- a/tests/security/test_ssl.robot
+++ b/security/test_ssl.robot
@@ -8,6 +8,7 @@
 Test Teardown     FFDC On Test Case Fail
 
 *** Test Cases ***
+
 Test SSL Connection
     [Documentation]  This testcase is for testing the SSL connection to the
     ...  OpenBMC machine.
@@ -18,12 +19,14 @@
     [Documentation]  Test that OpenBMC machine does not accept the non-secure
     ...  http connection at port 80 and would expect a connection error.
     [Tags]  Test_Non_SSL_Connection_To_Port_80
+
     Create Session  openbmc  http://${OPENBMC_HOST}/  timeout=3
-    Run Keyword And Expect Error  ConnectionError*  Get Request  openbmc  /list
+    Run Keyword And Expect Error  *ConnectTimeoutError*  GET On Session  openbmc  /list
 
 Test Non SSL Connection To HTTPS Port
     [Documentation]  Test that OpenBmc does not accept the non-secure
     ...  http connection at port ${HTTPS_PORT} and would expect a connection error.
     [Tags]  Test_Non_SSL_Connection_To_HTTPS_Port
+
     Create Session  openbmc  http://${OPENBMC_HOST}:${HTTPS_PORT}/  timeout=3
-    Run Keyword And Expect Error  ConnectionError*  Get Request  openbmc  /list
+    Run Keyword And Expect Error  ConnectionError*  GET On Session  openbmc  /list