diff --git a/web/pgadmin/tools/psql/tests/test_psql_disabled.py b/web/pgadmin/tools/psql/tests/test_psql_disabled.py
index fdae5d665..26f5e56a3 100644
--- a/web/pgadmin/tools/psql/tests/test_psql_disabled.py
+++ b/web/pgadmin/tools/psql/tests/test_psql_disabled.py
@@ -1,32 +1,32 @@
 import uuid
 import config
 import sys
-from pgadmin.utils.route import BaseTestGenerator
+from pgadmin.utils.route import BaseSocketTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from regression.test_setup import config_data
-from pgAdmin4 import app
-from .... import socketio
 
 
-class PSQLSocketDisabled(BaseTestGenerator):
+class PSQLSocketDisabled(BaseSocketTestGenerator):
+    SOCKET_NAMESPACE = '/pty'
+
     def setUp(self):
+        config.ENABLE_PSQL = False
+        super(PSQLSocketDisabled, self).setUp()
         self.db_name = "psqltestdb_{0}".format(str(uuid.uuid4())[1:8])
         self.sid = parent_node_dict["server"][-1]["server_id"]
         self.did = utils.create_database(self.server, self.db_name)
         self.sgid = config_data["server_group"]
-        config.ENABLE_PSQL = False
 
     def runTest(self):
         if sys.platform == 'win32':
             self.skipTest('PSQL disabled for windows')
-        self.test_client = socketio.test_client(app, namespace='/pty')
-        self.assertTrue(self.test_client.is_connected('/pty'))
-        received = self.test_client.get_received('/pty')
-
+        received = self.socket_client.get_received(self.SOCKET_NAMESPACE)
         assert received[0]['name'] == 'conn_not_allow'
-        self.test_client.disconnect(namespace='/pty')
-        self.assertFalse(self.test_client.is_connected('/pty'))
+
+        self.socket_client.disconnect(namespace=self.SOCKET_NAMESPACE)
+        self.assertFalse(self.socket_client.is_connected(
+            self.SOCKET_NAMESPACE))
 
     def tearDown(self):
         connection = utils.get_db_connection(self.server['db'],
diff --git a/web/pgadmin/tools/psql/tests/test_socket_connect.py b/web/pgadmin/tools/psql/tests/test_socket_connect.py
index 8a0d8d616..c7dc87450 100644
--- a/web/pgadmin/tools/psql/tests/test_socket_connect.py
+++ b/web/pgadmin/tools/psql/tests/test_socket_connect.py
@@ -1,16 +1,17 @@
 import uuid
 import config
 import sys
-from pgadmin.utils.route import BaseTestGenerator
+from pgadmin.utils.route import BaseSocketTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from regression.test_setup import config_data
-from pgAdmin4 import app
-from .... import socketio
 
 
-class PSQLSocketConnect(BaseTestGenerator):
+class PSQLSocketConnect(BaseSocketTestGenerator):
+    SOCKET_NAMESPACE = '/pty'
+
     def setUp(self):
+        super(PSQLSocketConnect, self).setUp()
         self.db_name = "psqltestdb_{0}".format(str(uuid.uuid4())[1:8])
         self.sid = parent_node_dict["server"][-1]["server_id"]
         self.did = utils.create_database(self.server, self.db_name)
@@ -20,14 +21,13 @@ class PSQLSocketConnect(BaseTestGenerator):
     def runTest(self):
         if sys.platform == 'win32':
             self.skipTest('PSQL disabled for windows')
-        self.test_client = socketio.test_client(app, namespace='/pty')
-        self.assertTrue(self.test_client.is_connected('/pty'))
-        received = self.test_client.get_received('/pty')
 
+        received = self.socket_client.get_received('/pty')
         assert received[0]['name'] == 'connected'
         assert received[0]['args'][0]['sid'] != ''
-        self.test_client.disconnect(namespace='/pty')
-        self.assertFalse(self.test_client.is_connected('/pty'))
+
+        self.socket_client.disconnect(namespace='/pty')
+        self.assertFalse(self.socket_client.is_connected('/pty'))
 
     def tearDown(self):
         connection = utils.get_db_connection(self.server['db'],
diff --git a/web/pgadmin/tools/psql/tests/test_start_process_fail.py b/web/pgadmin/tools/psql/tests/test_start_process_fail.py
index 6abfc5119..77706304b 100644
--- a/web/pgadmin/tools/psql/tests/test_start_process_fail.py
+++ b/web/pgadmin/tools/psql/tests/test_start_process_fail.py
@@ -1,16 +1,17 @@
 import uuid
 import config
 import sys
-from pgadmin.utils.route import BaseTestGenerator
+from pgadmin.utils.route import BaseSocketTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from regression.test_setup import config_data
-from pgAdmin4 import app
-from .... import socketio
 
 
-class PSQLStartProcessFail(BaseTestGenerator):
+class PSQLStartProcessFail(BaseSocketTestGenerator):
+    SOCKET_NAMESPACE = '/pty'
+
     def setUp(self):
+        super(PSQLStartProcessFail, self).setUp()
         self.db_name = "psqltestdb_{0}".format(str(uuid.uuid4())[1:8])
         self.sid = parent_node_dict["server"][-1]["server_id"]
         self.did = utils.create_database(self.server, self.db_name)
@@ -20,10 +21,7 @@ class PSQLStartProcessFail(BaseTestGenerator):
     def runTest(self):
         if sys.platform == 'win32':
             self.skipTest('PSQL disabled for windows')
-        self.test_client = socketio.test_client(app, namespace='/pty')
-        self.assertTrue(self.test_client.is_connected('/pty'))
-        received = self.test_client.get_received('/pty')
-
+        received = self.socket_client.get_received('/pty')
         assert received[0]['name'] == 'connected'
         assert received[0]['args'][0]['sid'] != ''
 
@@ -34,13 +32,13 @@ class PSQLStartProcessFail(BaseTestGenerator):
             'user': self.server['username']
         }
         config.ENABLE_PSQL = False
-        self.test_client.emit('start_process', data, namespace='/pty')
-        received = self.test_client.get_received('/pty')
+        self.socket_client.emit('start_process', data, namespace='/pty')
+        received = self.socket_client.get_received('/pty')
 
         assert received[0]['name'] == 'conn_not_allow'
 
-        self.test_client.disconnect(namespace='/pty')
-        self.assertFalse(self.test_client.is_connected('/pty'))
+        self.socket_client.disconnect(namespace='/pty')
+        self.assertFalse(self.socket_client.is_connected('/pty'))
 
     def tearDown(self):
         connection = utils.get_db_connection(self.server['db'],