diff --git a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py
index fab907e..38e24db 100644
--- a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py
+++ b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py
@@ -78,7 +78,8 @@ class CheckForXssFeatureTest(BaseFeatureTest):
                 self._check_xss_in_dependents_tab()
                 retry = 0
             except WebDriverException as e:
-                print("Exception in dependent check {0}".format(retry))
+                print("Exception in dependent check {0}".format(retry),
+                      file=sys.stderr)
                 if retry == 1:
                     raise e
                 retry -= 1
@@ -166,9 +167,11 @@ class CheckForXssFeatureTest(BaseFeatureTest):
                                             "td[2]").get_attribute('innerHTML')
                 retry = 0
             except WebDriverException as e:
-                print("Exception in dependent tab {0}".format(retry))
+                print("Exception in dependent tab {0}".format(retry),
+                      file=sys.stderr)
                 self.page.click_tab("Dependencies")
                 if retry == 1:
+                    self.page.click_tab("Dependents")
                     raise e
                 retry -= 1
 
diff --git a/web/regression/feature_utils/pgadmin_page.py b/web/regression/feature_utils/pgadmin_page.py
index fb2f4cd..4462a36 100644
--- a/web/regression/feature_utils/pgadmin_page.py
+++ b/web/regression/feature_utils/pgadmin_page.py
@@ -963,9 +963,10 @@ class PgadminPage:
                 codemirror_ele.click()
                 retry = 0
             except WebDriverException as e:
-                print("Exception in filling code mirror {0} ".format(retry))
+                print("Exception in filling code mirror {0} ".format(retry),
+                      file=sys.stderr)
                 print(str(e))
-                if retry == 0:
+                if retry == 1:
                     raise e
                 retry -= 1
 
diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py
index b3deb4d..16b53f7 100644
--- a/web/regression/python_test_utils/test_utils.py
+++ b/web/regression/python_test_utils/test_utils.py
@@ -1494,3 +1494,87 @@ def quit_webdriver(driver):
         print("Some Other exception occurred.")
         traceback.print_exc(file=sys.stderr)
         print(str(e))
+
+
+def delete_server(tester, server_information=None):
+    """ This function use to delete test server """
+    try:
+        parent_node_dict = regression.parent_node_dict
+        test_servers = parent_node_dict["server"]
+        test_databases = parent_node_dict["database"]
+        test_roles = regression.node_info_dict["lrid"]
+        test_table_spaces = regression.node_info_dict["tsid"]
+        for server in test_servers:
+            if server["server_id"] == server_information['server_id']:
+                srv_id = server["server_id"]
+                servers_dict = server["server"]
+
+                deleted_db = []
+                for database in test_databases:
+                    if database['server_id'] == srv_id:
+                        connection = get_db_connection(
+                            servers_dict['db'],
+                            servers_dict['username'],
+                            servers_dict['db_password'],
+                            servers_dict['host'],
+                            servers_dict['port'],
+                            servers_dict['sslmode']
+                        )
+                        # Drop database
+                        drop_database(connection, database["db_name"])
+                        deleted_db.append(database)
+
+                if len(deleted_db) > 0:
+                    print("Deleted DB  {0}".format(
+                            deleted_db), file=sys.stderr)
+                    for ele in deleted_db:
+                        regression.parent_node_dict["database"].remove(ele)
+
+                deleted_roles = []
+                for role in test_roles:
+                    if role['server_id'] == srv_id:
+                        connection = get_db_connection(
+                            servers_dict['db'],
+                            servers_dict['username'],
+                            servers_dict['db_password'],
+                            servers_dict['host'],
+                            servers_dict['port'],
+                            servers_dict['sslmode']
+                        )
+                        # Delete role
+                        regression.roles_utils.delete_role(
+                            connection, role["role_name"]
+                        )
+                        deleted_roles.append(role)
+
+                if len(deleted_roles) > 0:
+                    print("Deleted Roles  {0}".format(
+                            deleted_roles), file=sys.stderr)
+                    for ele in deleted_roles:
+                        regression.node_info_dict["lrid"].remove(ele)
+
+                for tablespace in test_table_spaces:
+                    if tablespace['server_id'] == srv_id:
+                        connection = get_db_connection(
+                            servers_dict['db'],
+                            servers_dict['username'],
+                            servers_dict['db_password'],
+                            servers_dict['host'],
+                            servers_dict['port'],
+                            servers_dict['sslmode']
+                        )
+                        # Delete tablespace
+                        regression.tablespace_utils.delete_tablespace(
+                            connection, tablespace["tablespace_name"]
+                        )
+                        print(
+                            "Deleted Tablepace  {0}".format(
+                            tablespace["tablespace_name"]), file=sys.stderr)
+
+                # Delete server
+                delete_server_with_api(tester, srv_id)
+                print("Deleted Database, Roles, Tablespace for {0}".format(
+                    servers_dict['name']), file=sys.stderr)
+    except Exception:
+        traceback.print_exc(file=sys.stderr)
+        raise
diff --git a/web/regression/runtests.py b/web/regression/runtests.py
index 7635767..bcb7b2a 100644
--- a/web/regression/runtests.py
+++ b/web/regression/runtests.py
@@ -500,7 +500,8 @@ def execute_test(test_module_list_passed, server_passed, driver_passed):
             test_utils.drop_database(connection, test_db_name)
             connection.close()
         # Delete test server
-        test_utils.delete_test_server(test_client)
+        # test_utils.delete_test_server(test_client)
+        test_utils.delete_server(test_client, server_information)
     except Exception as exc:
         traceback.print_exc(file=sys.stderr)
         print(str(exc))