diff --git a/tests/security/test_ssl.robot b/tests/security/test_ssl.robot
index 7bcab5e..0f05d9d 100644
--- a/tests/security/test_ssl.robot
+++ b/tests/security/test_ssl.robot
@@ -5,8 +5,6 @@
 Resource          ../../lib/rest_client.robot
 Resource          ../../lib/resource.txt
 
-Library           RequestsLibrary.RequestsKeywords
-
 *** Test Cases ***
 Test SSL Connection
     [Documentation]     This testcase is for testing the SSL connection to the
@@ -26,7 +24,7 @@
     ...     will not accepts the non-secure connection that is with http to
     ...     port 80 and expect a connection error
     Create Session    openbmc    http://${OPENBMC_HOST}/    timeout=3
-    Run Keyword And Expect Error    ConnectTimeout*   Get Request    openbmc   /list
+    Run Keyword And Expect Error    ConnectionError*   Get Request    openbmc   /list
 
 Test non-SSL Connection to port 443
     [Documentation]     This testcase is for test to check OpenBMC machine
diff --git a/tests/test_association.robot b/tests/test_association.robot
index b4422d5..5931afe 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -4,7 +4,6 @@
 Resource        ../lib/rest_client.robot
 Resource        ../lib/utils.robot
 
-Library         BuiltIn
 Library         Collections
 Library         SSHLibrary
 
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index b6528c7..19637eb 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -11,8 +11,6 @@
 
 
 *** Variables ***
-${SYSTEM_SHUTDOWN_TIME}       ${5}
-${WAIT_FOR_POWER_OPERATION}   30sec
 
 *** Test Cases ***
 
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index 8280f78..c294ae5 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -128,7 +128,7 @@
     ${resp} =    openbmc post request     ${deluri}    data=${NIL}
     should be equal as strings      ${resp.status_code}     ${HTTP_OK}
 
-makeing new log after obmc-phosphor-event.service restart
+making new log after obmc-phosphor-event.service restart
     [Documentation]     This is for testing event creation after the
     ...                 event service is restarted.
     [Tags]  CI
diff --git a/tests/test_fan.robot b/tests/test_fan.robot
index 2f593b5..dfb9502 100644
--- a/tests/test_fan.robot
+++ b/tests/test_fan.robot
@@ -4,3 +4,7 @@
 Resource          ../lib/rest_client.robot
 
 *** Test Cases ***
+Test place holder dummy
+   [Documentation]   Dummy Test case. We can't have an empty test case in
+   ...               the testcase directory.
+   Log    This is a dummy test case.. Ignore
diff --git a/tests/test_power_restore.robot b/tests/test_power_restore.robot
index d0e27d5..15fff11 100644
--- a/tests/test_power_restore.robot
+++ b/tests/test_power_restore.robot
@@ -10,8 +10,6 @@
 
 Library         SSHLibrary
 
-[Documentation]       Data Driven Tests
-
 
 ***test cases***