diff --git a/tabpy/tabpy_server/common/messages.py b/tabpy/tabpy_server/common/messages.py
index 5e1354ec..25c05d14 100644
--- a/tabpy/tabpy_server/common/messages.py
+++ b/tabpy/tabpy_server/common/messages.py
@@ -4,7 +4,7 @@
 import json
 
 
-class Msg(object):
+class Msg:
     """
     An abstract base class for all messages used for communicating between
     the WebServices.
diff --git a/tabpy/tabpy_server/handlers/base_handler.py b/tabpy/tabpy_server/handlers/base_handler.py
index 4ee0934d..2a13b36f 100644
--- a/tabpy/tabpy_server/handlers/base_handler.py
+++ b/tabpy/tabpy_server/handlers/base_handler.py
@@ -12,7 +12,7 @@
 STAGING_THREAD = concurrent.futures.ThreadPoolExecutor(max_workers=3)
 
 
-class ContextLoggerWrapper(object):
+class ContextLoggerWrapper:
     '''
     This class appends request context to logged messages.
     '''
diff --git a/tabpy/tabpy_server/management/state.py b/tabpy/tabpy_server/management/state.py
index c1353ece..9dbf6d77 100644
--- a/tabpy/tabpy_server/management/state.py
+++ b/tabpy/tabpy_server/management/state.py
@@ -64,7 +64,7 @@ def get_query_object_path(state_file_path, name, version):
     return full_path
 
 
-class TabPyState(object):
+class TabPyState:
     '''
     The TabPy state object that stores attributes
     about this TabPy and perform GET/SET on these
diff --git a/tabpy/tabpy_server/psws/python_service.py b/tabpy/tabpy_server/psws/python_service.py
index 768b113e..8e98bf77 100644
--- a/tabpy/tabpy_server/psws/python_service.py
+++ b/tabpy/tabpy_server/psws/python_service.py
@@ -50,7 +50,7 @@ def manage_request(self, msg):
             return UnknownMessage(msg)
 
 
-class PythonService(object):
+class PythonService:
     """
     This class is a simple wrapper maintaining loaded query objects from
     the current TabPy instance. `query_objects` is a dictionary that
diff --git a/tabpy/tabpy_tools/client.py b/tabpy/tabpy_tools/client.py
index 758397cb..a8ec4076 100755
--- a/tabpy/tabpy_tools/client.py
+++ b/tabpy/tabpy_tools/client.py
@@ -55,7 +55,7 @@ def _check_endpoint_name(name):
             ' underscore, hyphens and spaces.')
 
 
-class Client(object):
+class Client:
     def __init__(self,
                  endpoint,
                  query_timeout=1000):
diff --git a/tabpy/tabpy_tools/rest.py b/tabpy/tabpy_tools/rest.py
index 9446708c..3f5125cc 100755
--- a/tabpy/tabpy_tools/rest.py
+++ b/tabpy/tabpy_tools/rest.py
@@ -33,7 +33,7 @@ def __str__(self):
                 f'{self.info}')
 
 
-class RequestsNetworkWrapper(object):
+class RequestsNetworkWrapper:
     """The NetworkWrapper wraps the underlying network connection to simplify
     the interface a bit. This can be replaced with something that can be built
     on some other type of network connection, such as PyCURL.
@@ -178,7 +178,7 @@ def set_credentials(self, username, password):
         self.auth = HTTPBasicAuth(username, password)
 
 
-class ServiceClient(object):
+class ServiceClient:
     """
     A generic service client.
 
@@ -235,7 +235,7 @@ def set_credentials(self, username, password):
         self.network_wrapper.set_credentials(username, password)
 
 
-class RESTProperty(object):
+class RESTProperty:
     """A descriptor that will control the type of value stored."""
 
     def __init__(self, type, from_json=lambda x: x, to_json=lambda x: x,
diff --git a/tabpy/tabpy_tools/rest_client.py b/tabpy/tabpy_tools/rest_client.py
index 2210bc5e..8bb84cd5 100755
--- a/tabpy/tabpy_tools/rest_client.py
+++ b/tabpy/tabpy_tools/rest_client.py
@@ -118,7 +118,7 @@ def __init__(self, **kwargs):
         self.type = 'alias'
 
 
-class RESTServiceClient(object):
+class RESTServiceClient:
     """A thin client for the REST Service."""
     def __init__(self, service_client):
         self.service_client = service_client