diff --git a/docs/conf.py b/docs/conf.py
index 4191da11..a18d6038 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # solnlib documentation build configuration file, created by
 # sphinx-quickstart on Sat Feb 27 15:17:42 2016.
diff --git a/examples/main.py b/examples/main.py
index f36f1be4..e8d6798a 100644
--- a/examples/main.py
+++ b/examples/main.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import print_function
 import sys
 import os
 import os.path as op
@@ -24,7 +23,7 @@
 
 def setup_environment():
     print("Setup solnlib demo environment...")
-    print("Copying %s to %s" % (source_dir, target_dir))
+    print("Copying {} to {}".format(source_dir, target_dir))
     shutil.copytree(source_dir, target_dir)
     shutil.copytree(solnlib_lib_dir, solnlib_lib_target_dir)
     os.system(splunk_bin + " start")
diff --git a/examples/test__kvstore.py b/examples/test__kvstore.py
index 23e4da55..2b17d544 100644
--- a/examples/test__kvstore.py
+++ b/examples/test__kvstore.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from builtins import range
 import json
 import os.path as op
 import sys
diff --git a/examples/test_credentials.py b/examples/test_credentials.py
index df44afcf..7b61d167 100644
--- a/examples/test_credentials.py
+++ b/examples/test_credentials.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from builtins import range
 import sys
 import os.path as op
 import pytest
diff --git a/examples/test_hec_event_writer.py b/examples/test_hec_event_writer.py
index ac81e337..36e6fbe2 100644
--- a/examples/test_hec_event_writer.py
+++ b/examples/test_hec_event_writer.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from builtins import range
 import sys
 import os.path as op
 
diff --git a/examples/test_metadata.py b/examples/test_metadata.py
index bdad5abe..7955c63e 100644
--- a/examples/test_metadata.py
+++ b/examples/test_metadata.py
@@ -15,7 +15,7 @@ def test_metadata_reader():
     mr = metadata.MetadataReader(context.app)
 
     modtime = mr.get("collections", "sessions", "modtime")
-    assert isinstance(modtime, six.text_type)
+    assert isinstance(modtime, str)
 
     modtime = mr.get_float("collections", "sessions", "modtime")
     assert type(modtime) == float
diff --git a/examples/test_server_info.py b/examples/test_server_info.py
index 8c44cd07..70be6369 100644
--- a/examples/test_server_info.py
+++ b/examples/test_server_info.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import print_function
 import os.path as op
 import sys
 
diff --git a/examples/test_user_access.py b/examples/test_user_access.py
index cccf5c1f..1f8ba3a3 100644
--- a/examples/test_user_access.py
+++ b/examples/test_user_access.py
@@ -53,7 +53,7 @@ def test_object_acl_manager():
         replace_existing=False,
     )
     obj_acl = oaclm.get_acl(obj_collection, obj_id1)
-    assert set((obj_acl.obj_perms["read"])) == set(["admin", "user1"])
+    assert set(obj_acl.obj_perms["read"]) == {"admin", "user1"}
 
     oaclm.update_acls(
         obj_collection,
diff --git a/solnlib/acl.py b/solnlib/acl.py
index 83a38aea..69a08cde 100644
--- a/solnlib/acl.py
+++ b/solnlib/acl.py
@@ -20,7 +20,7 @@ class ACLException(Exception):
     pass
 
 
-class ACLManager(object):
+class ACLManager:
     """ACL manager.
 
     :param session_key: Splunk access token.
diff --git a/solnlib/api_documenter.py b/solnlib/api_documenter.py
index 2285d655..066e86f6 100644
--- a/solnlib/api_documenter.py
+++ b/solnlib/api_documenter.py
@@ -401,7 +401,7 @@ def _generate_documentation(context, method_list):
     generator.update_spec()
 
 
-class _SwaggerSpecGenerator(object):
+class _SwaggerSpecGenerator:
     """Private class to generate the swagger spec file."""
 
     def __init__(self, swagger_api):
@@ -451,7 +451,7 @@ def update_spec(self):
             )
 
 
-class _SwaggerApi(object):
+class _SwaggerApi:
     """
     Private class to generate the swagger
      documentation and default params values.
@@ -459,7 +459,7 @@ class _SwaggerApi(object):
 
     def __init__(self):
         if op.isfile(tempfile.gettempdir() + op.sep + "temp.yaml"):
-            with open(tempfile.gettempdir() + op.sep + "temp.yaml", "r") as stream:
+            with open(tempfile.gettempdir() + op.sep + "temp.yaml") as stream:
                 try:
                     spec = yaml.safe_load(stream)
                     self.swagger = spec["swagger"]
@@ -606,10 +606,10 @@ def create_model(self, params, name, req):
             definition["requirements"] = req
         for param in params:
             # get type of property
-            type_info = re.findall("\((.*?)\)\s", str(params.get(param)), re.DOTALL)
+            type_info = re.findall(r"\((.*?)\)\s", str(params.get(param)), re.DOTALL)
             if type_info and len(type_info) > 0:
                 type_info = type_info[0]
-            prop_type = re.findall("\<(.*?)\(", str(params.get(param)), re.DOTALL)
+            prop_type = re.findall(r"\<(.*?)\(", str(params.get(param)), re.DOTALL)
             if prop_type and len(prop_type) > 0:
                 prop_type = prop_type[0]
             if prop_type in self.type_converter:
diff --git a/solnlib/compression.py b/solnlib/compression.py
index 68e6a8c4..62608e9e 100644
--- a/solnlib/compression.py
+++ b/solnlib/compression.py
@@ -16,7 +16,7 @@
 __all__ = ["GzipHandler", "ZipHandler"]
 
 
-class GzipHandler(object):
+class GzipHandler:
     """
     Class for handling gzip-formatted string content.
     """
@@ -57,7 +57,7 @@ def decompress(cls, data):
         return gzip.GzipFile(fileobj=BytesIO(data), mode="rb").read()
 
 
-class ZipHandler(object):
+class ZipHandler:
     """
     Class for handling zip files.
     """
diff --git a/solnlib/conf_manager.py b/solnlib/conf_manager.py
index fa1ca66b..5d6199e1 100644
--- a/solnlib/conf_manager.py
+++ b/solnlib/conf_manager.py
@@ -31,7 +31,7 @@ class ConfStanzaNotExistException(Exception):
     pass
 
 
-class ConfFile(object):
+class ConfFile:
     """Configuration file.
 
     :param name: Configuration file name.
@@ -211,12 +211,12 @@ def get(self, stanza_name, only_current_app=False):
                 raise
 
             raise ConfStanzaNotExistException(
-                "Stanza: %s does not exist in %s.conf" % (stanza_name, self._name)
+                "Stanza: {} does not exist in {}.conf".format(stanza_name, self._name)
             )
 
         if len(stanza_mgrs) == 0:
             raise ConfStanzaNotExistException(
-                "Stanza: %s does not exist in %s.conf" % (stanza_name, self._name)
+                "Stanza: {} does not exist in {}.conf".format(stanza_name, self._name)
             )
 
         stanza = self._decrypt_stanza(stanza_mgrs[0].name, stanza_mgrs[0].content)
@@ -326,7 +326,7 @@ def delete(self, stanza_name):
                 "Delete stanza: %s error: %s.", stanza_name, traceback.format_exc()
             )
             raise ConfStanzaNotExistException(
-                "Stanza: %s does not exist in %s.conf" % (stanza_name, self._name)
+                "Stanza: {} does not exist in {}.conf".format(stanza_name, self._name)
             )
 
     @retry(exceptions=[binding.HTTPError])
@@ -349,7 +349,7 @@ class ConfManagerException(Exception):
     pass
 
 
-class ConfManager(object):
+class ConfManager:
     """Configuration file manager.
 
     :param session_key: Splunk access token.
diff --git a/solnlib/credentials.py b/solnlib/credentials.py
index c1e15b7f..c0419867 100644
--- a/solnlib/credentials.py
+++ b/solnlib/credentials.py
@@ -35,7 +35,7 @@ class CredentialNotExistException(Exception):
     pass
 
 
-class CredentialManager(object):
+class CredentialManager:
     """Credential manager.
 
     :param session_key: Splunk access token.
@@ -125,7 +125,7 @@ def get_password(self, user):
                 return password["clear_password"]
 
         raise CredentialNotExistException(
-            "Failed to get password of realm=%s, user=%s." % (self._realm, user)
+            "Failed to get password of realm={}, user={}.".format(self._realm, user)
         )
 
     @retry(exceptions=[binding.HTTPError])
@@ -211,7 +211,7 @@ def delete_password(self, user):
         """
         all_passwords = self._get_all_passwords_in_realm()
         deleted = False
-        ent_pattern = re.compile("(%s%s\d+)" % (user.replace("\\", "\\\\"), self.SEP))
+        ent_pattern = re.compile(r"({}{}\d+)".format(user.replace("\\", "\\\\"), self.SEP))
         for password in list(all_passwords):
             match = (user == password.username) or ent_pattern.match(password.username)
             if match and password.realm == self._realm:
@@ -220,7 +220,7 @@ def delete_password(self, user):
 
         if not deleted:
             raise CredentialNotExistException(
-                "Failed to delete password of realm=%s, user=%s" % (self._realm, user)
+                "Failed to delete password of realm={}, user={}".format(self._realm, user)
             )
 
     def _get_all_passwords_in_realm(self):
diff --git a/solnlib/file_monitor.py b/solnlib/file_monitor.py
index e4a4af07..cb7994bd 100644
--- a/solnlib/file_monitor.py
+++ b/solnlib/file_monitor.py
@@ -18,7 +18,7 @@
 __all__ = ["FileChangesChecker", "FileMonitor"]
 
 
-class FileChangesChecker(object):
+class FileChangesChecker:
     """Files change checker.
 
     :param callback: Callback function for files change.
@@ -67,7 +67,7 @@ def check_changes(self):
         return False
 
 
-class FileMonitor(object):
+class FileMonitor:
     """Files change monitor.
 
     Monitor files change in a separated thread and call callback
diff --git a/solnlib/hec_config.py b/solnlib/hec_config.py
index 37fea9b5..e18ca402 100644
--- a/solnlib/hec_config.py
+++ b/solnlib/hec_config.py
@@ -10,7 +10,7 @@
 __all__ = ["HECConfig"]
 
 
-class HECConfig(object):
+class HECConfig:
     """HTTP Event Collector configuration.
 
     :param session_key: Splunk access token.
diff --git a/solnlib/log.py b/solnlib/log.py
index b23abc3f..b26d1811 100644
--- a/solnlib/log.py
+++ b/solnlib/log.py
@@ -50,7 +50,7 @@ class LogException(Exception):
     pass
 
 
-class Logs(with_metaclass(Singleton, object)):
+class Logs(metaclass=Singleton):
     """A singleton class that manage all kinds of logger.
 
     Usage::
diff --git a/solnlib/metadata.py b/solnlib/metadata.py
index e7021e1f..c0057c6a 100644
--- a/solnlib/metadata.py
+++ b/solnlib/metadata.py
@@ -24,7 +24,7 @@
 __all__ = ["MetadataReader"]
 
 
-class MetadataReader(object):
+class MetadataReader:
     """Metadata reader for `app`.
 
     :param app: App name.
@@ -46,7 +46,7 @@ def __init__(self, app):
             # May raise ConfigParser.ParsingError
             self._cfg.read(local_meta)
         else:
-            raise IOError("No such file: %s." % local_meta)
+            raise OSError("No such file: %s." % local_meta)
 
     def get(self, conf, stanza, option):
         """Return the metadata value of option in [conf/stanza] section.
diff --git a/solnlib/modular_input/checkpointer.py b/solnlib/modular_input/checkpointer.py
index 4ea71019..72aa2f33 100644
--- a/solnlib/modular_input/checkpointer.py
+++ b/solnlib/modular_input/checkpointer.py
@@ -29,7 +29,7 @@ class CheckpointerException(Exception):
     pass
 
 
-class Checkpointer(with_metaclass(ABCMeta, object)):
+class Checkpointer(metaclass=ABCMeta):
     """Base class of checkpointer."""
 
     @abstractmethod
@@ -264,7 +264,7 @@ def update(self, key, state):
         if op.exists(file_name):
             try:
                 os.remove(file_name)
-            except IOError:
+            except OSError:
                 pass
 
         os.rename(file_name + "_new", file_name)
@@ -276,9 +276,9 @@ def batch_update(self, states):
     def get(self, key):
         file_name = op.join(self._checkpoint_dir, self.encode_key(key))
         try:
-            with open(file_name, "r") as fp:
+            with open(file_name) as fp:
                 return json.load(fp)
-        except (IOError, ValueError):
+        except (OSError, ValueError):
             return None
 
     def delete(self, key):
diff --git a/solnlib/modular_input/event.py b/solnlib/modular_input/event.py
index d3297eb6..597f10c1 100644
--- a/solnlib/modular_input/event.py
+++ b/solnlib/modular_input/event.py
@@ -10,7 +10,7 @@
 import json
 
 try:
-    import xml.etree.cElementTree as ET
+    import xml.etree.ElementTree as ET
 except ImportError:
     import xml.etree.ElementTree as ET
 
@@ -32,7 +32,7 @@ class EventException(Exception):
     pass
 
 
-class Event(object):
+class Event:
     """Base class of modular input event."""
 
     def __init__(
diff --git a/solnlib/modular_input/event_writer.py b/solnlib/modular_input/event_writer.py
index 185b533e..1a2e363f 100644
--- a/solnlib/modular_input/event_writer.py
+++ b/solnlib/modular_input/event_writer.py
@@ -28,7 +28,7 @@
 __all__ = ["ClassicEventWriter", "HECEventWriter"]
 
 
-class EventWriter(with_metaclass(ABCMeta, object)):
+class EventWriter(metaclass=ABCMeta):
     """Base class of event writer."""
 
     description = "EventWriter"
@@ -221,7 +221,7 @@ def __init__(
         logger=None,
         **context
     ):
-        super(HECEventWriter, self).__init__()
+        super().__init__()
         self._session_key = session_key
         if logger:
             self.logger = logger
diff --git a/solnlib/modular_input/modular_input.py b/solnlib/modular_input/modular_input.py
index 7cc061a3..345768ea 100644
--- a/solnlib/modular_input/modular_input.py
+++ b/solnlib/modular_input/modular_input.py
@@ -26,7 +26,7 @@
 from six import with_metaclass
 
 try:
-    import xml.etree.cElementTree as ET
+    import xml.etree.ElementTree as ET
 except ImportError:
     import xml.etree.ElementTree as ET
 
@@ -51,7 +51,7 @@ class ModularInputException(Exception):
     pass
 
 
-class ModularInput(with_metaclass(ABCMeta, object)):
+class ModularInput(metaclass=ABCMeta):
     """Base class of Splunk modular input.
 
     It's a base modular input, it should be inherited by sub modular input. For
diff --git a/solnlib/net_utils.py b/solnlib/net_utils.py
index 80f8aab4..ef894d1c 100644
--- a/solnlib/net_utils.py
+++ b/solnlib/net_utils.py
@@ -61,7 +61,7 @@ def is_valid_hostname(hostname):
         return False
     if hostname[-1:] == ".":
         hostname = hostname[:-1]
-    allowed = re.compile("(?!-)(::)?[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
+    allowed = re.compile(r"(?!-)(::)?[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
     return all(allowed.match(x) for x in hostname.split("."))
 
 
diff --git a/solnlib/orphan_process_monitor.py b/solnlib/orphan_process_monitor.py
index 426eb159..8e40990a 100644
--- a/solnlib/orphan_process_monitor.py
+++ b/solnlib/orphan_process_monitor.py
@@ -14,7 +14,7 @@
 __all__ = ["OrphanProcessChecker", "OrphanProcessMonitor"]
 
 
-class OrphanProcessChecker(object):
+class OrphanProcessChecker:
     """Orphan process checker.
 
     Only work for Linux platform. On Windows platform, is_orphan
@@ -61,7 +61,7 @@ def check_orphan(self):
         return res
 
 
-class OrphanProcessMonitor(object):
+class OrphanProcessMonitor:
     """Orpan process monitor.
 
     Check if process become orphan in background thread per
diff --git a/solnlib/pattern.py b/solnlib/pattern.py
index a7341636..ea517a70 100644
--- a/solnlib/pattern.py
+++ b/solnlib/pattern.py
@@ -24,10 +24,10 @@ class Singleton(type):
     """
 
     def __init__(cls, name, bases, attrs):
-        super(Singleton, cls).__init__(name, bases, attrs)
+        super().__init__(name, bases, attrs)
         cls._instance = None
 
     def __call__(cls, *args, **kwargs):
         if cls._instance is None:
-            cls._instance = super(Singleton, cls).__call__(*args, **kwargs)
+            cls._instance = super().__call__(*args, **kwargs)
         return cls._instance
diff --git a/solnlib/server_info.py b/solnlib/server_info.py
index c027a91a..bb3dab70 100644
--- a/solnlib/server_info.py
+++ b/solnlib/server_info.py
@@ -21,7 +21,7 @@ class ServerInfoException(Exception):
     pass
 
 
-class ServerInfo(object):
+class ServerInfo:
     """This class is a wrapper of splunk server info.
 
     :param session_key: Splunk access token.
diff --git a/solnlib/splunk_rest_client.py b/solnlib/splunk_rest_client.py
index 143b279b..dd5ac891 100644
--- a/solnlib/splunk_rest_client.py
+++ b/solnlib/splunk_rest_client.py
@@ -207,7 +207,7 @@ def __init__(
             scheme, host, port = get_splunkd_access_info()
 
         handler = _request_handler(context)
-        super(SplunkRestClient, self).__init__(
+        super().__init__(
             handler=handler,
             scheme=scheme,
             host=host,
diff --git a/solnlib/splunkenv.py b/solnlib/splunkenv.py
index f7332bc7..53b863ee 100644
--- a/solnlib/splunkenv.py
+++ b/solnlib/splunkenv.py
@@ -138,7 +138,7 @@ def make_splunkhome_path(parts):
     # Check that we haven't escaped from intended parent directories.
     if os.path.relpath(fullpath, basepath)[0:2] == "..":
         raise ValueError(
-            'Illegal escape from parent directory "%s": %s' % (basepath, fullpath)
+            'Illegal escape from parent directory "{}": {}'.format(basepath, fullpath)
         )
     return fullpath
 
diff --git a/solnlib/time_parser.py b/solnlib/time_parser.py
index 19301b23..e641cbd0 100644
--- a/solnlib/time_parser.py
+++ b/solnlib/time_parser.py
@@ -21,7 +21,7 @@ class InvalidTimeFormatException(Exception):
     pass
 
 
-class TimeParser(object):
+class TimeParser:
     """Datetime parser.
 
     Use splunkd rest to parse datetime.
diff --git a/solnlib/timer_queue.py b/solnlib/timer_queue.py
index f22c91ac..8f5b2061 100644
--- a/solnlib/timer_queue.py
+++ b/solnlib/timer_queue.py
@@ -22,7 +22,7 @@
 __all__ = ["Timer", "TimerQueueStruct", "TimerQueue"]
 
 
-class Timer(object):
+class Timer:
     """Timer wraps the callback and timestamp related attributes.
 
     :param callback: Arbitrary callable object.
@@ -79,7 +79,7 @@ def __call__(self):
 TEARDOWN_SENTINEL = None
 
 
-class TimerQueueStruct(object):
+class TimerQueueStruct:
     """
     The underlying data structure for TimerQueue
     """
@@ -187,8 +187,8 @@ def check_and_execute(self):
         return _calc_sleep_time(next_expired_time)
 
 
-class TimerQueue(object):
-    """A simple timer queue implementation.
+class TimerQueue:
+    r"""A simple timer queue implementation.
 
     It runs a separate thread to handle timers Note: to effectively use this
     timer queue, the timer callback should be short, otherwise it will cause
diff --git a/solnlib/user_access.py b/solnlib/user_access.py
index 59a349be..a5511805 100644
--- a/solnlib/user_access.py
+++ b/solnlib/user_access.py
@@ -36,7 +36,7 @@ class ObjectACLException(Exception):
     pass
 
 
-class ObjectACL(object):
+class ObjectACL:
     """Object ACL record.
 
     :param obj_collection: Collection where object currently stored.
@@ -241,7 +241,7 @@ class ObjectACLNotExistException(Exception):
     pass
 
 
-class ObjectACLManager(object):
+class ObjectACLManager:
     """Object ACL manager.
 
     :param collection_name: Collection name to store object ACL info.
@@ -441,7 +441,7 @@ def get_acl(self, obj_collection, obj_id):
                 raise
 
             raise ObjectACLNotExistException(
-                "Object ACL info of %s_%s does not exist." % (obj_collection, obj_id)
+                "Object ACL info of {}_{} does not exist.".format(obj_collection, obj_id)
             )
 
         return ObjectACL.parse(obj_acl)
@@ -496,7 +496,7 @@ def delete_acl(self, obj_collection, obj_id):
                 raise
 
             raise ObjectACLNotExistException(
-                "Object ACL info of %s_%s does not exist." % (obj_collection, obj_id)
+                "Object ACL info of {}_{} does not exist.".format(obj_collection, obj_id)
             )
 
     @retry(exceptions=[binding.HTTPError])
@@ -556,7 +556,7 @@ class AppCapabilityNotExistException(Exception):
     pass
 
 
-class AppCapabilityManager(object):
+class AppCapabilityManager:
     """App capability manager.
 
     :param collection_name: Collection name to store capabilities.
diff --git a/tests/common.py b/tests/common.py
index 59f7bd6b..952e3d8f 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -21,7 +21,7 @@
 
 
 def mock_splunkhome(monkeypatch):
-    class MockPopen(object):
+    class MockPopen:
         def __init__(
             self,
             args,
@@ -83,7 +83,7 @@ def mock_gethostname():
 
 
 def make_response_record(body, status=200):
-    class _MocBufReader(object):
+    class _MocBufReader:
         def __init__(self, buf):
             if isinstance(buf, str):
                 self._buf = buf.encode("utf-8")
diff --git a/tests/test_acl.py b/tests/test_acl.py
index 43a477cc..5eb1a07f 100644
--- a/tests/test_acl.py
+++ b/tests/test_acl.py
@@ -41,7 +41,7 @@ def _mock_post(
         return common.make_response_record(_old_acl)
 
 
-class TestACLManager(object):
+class TestACLManager:
     def test_get(self, monkeypatch):
         common.mock_splunkhome(monkeypatch)
         monkeypatch.setattr(binding.Context, "get", _mock_get)
diff --git a/tests/test_api_documenter.py b/tests/test_api_documenter.py
index 98bfa287..82a806ab 100644
--- a/tests/test_api_documenter.py
+++ b/tests/test_api_documenter.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 try:
-    from mock import Mock
+    from unittest.mock import Mock
 except:
     from unittest.mock import Mock
 
@@ -16,7 +16,7 @@
 from solnlib.api_documenter import *
 
 
-class TestApiDocumenter(object):
+class TestApiDocumenter:
     @api()
     def test_init(self, *args, **kwargs):
         assert True
diff --git a/tests/test_compression.py b/tests/test_compression.py
index cfcecef4..51ac7f92 100644
--- a/tests/test_compression.py
+++ b/tests/test_compression.py
@@ -10,7 +10,7 @@
 from solnlib import compression
 
 
-class TestGzipHandler(object):
+class TestGzipHandler:
     normal_data = b"test"
     gzcomp_data = b"\x1f\x8b\x08\x08\xc7I\xd5V\x02\xfftest\x00+I-.\x01\x00\x0c~\x7f\xd8\x04\x00\x00\x00"
 
@@ -26,7 +26,7 @@ def test_decompress(self, monkeypatch):
         assert compression.GzipHandler.decompress(self.gzcomp_data) == self.normal_data
 
 
-class TestZiphandler(object):
+class TestZiphandler:
     normal_data = b"test"
     zcomp_bad_data = b"PK\x03\x04\x14\x00\x00\x00\x00\x00\x03\x89aH\xc65\xb9;\x05\x00\x00\x00\x05\x00\x00\x00\t\x00\x00\x00test1.txttestPK\x01\x02\x14\x03\x14\x00\x00\x00\x00\x00\x03\x89aH\xc65\xb9;\x05\x00\x00\x00\x05\x00\x00\x00\t\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00test1.txtPK\x05\x06\x00\x00\x00\x00\x01\x00\x01\x007\x00\x00\x00,\x00\x00\x00\x00\x00"
     zcomp_data_2files = b"PK\x03\x04\x14\x00\x00\x00\x00\x00d\x84aHS\xfcQg\x02\x00\x00\x00\x02\x00\x00\x00\t\x00\x00\x00test1.txt1\nPK\x03\x04\x14\x00\x00\x00\x00\x00g\x84aH\x90\xaf|L\x02\x00\x00\x00\x02\x00\x00\x00\t\x00\x00\x00test2.txt2\nPK\x01\x02\x14\x03\x14\x00\x00\x00\x00\x00d\x84aHS\xfcQg\x02\x00\x00\x00\x02\x00\x00\x00\t\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00test1.txtPK\x01\x02\x14\x03\x14\x00\x00\x00\x00\x00g\x84aH\x90\xaf|L\x02\x00\x00\x00\x02\x00\x00\x00\t\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81)\x00\x00\x00test2.txtPK\x05\x06\x00\x00\x00\x00\x02\x00\x02\x00n\x00\x00\x00R\x00\x00\x00\x00\x00"
diff --git a/tests/test_conf_manager.py b/tests/test_conf_manager.py
index 1de580b7..1ab722bf 100644
--- a/tests/test_conf_manager.py
+++ b/tests/test_conf_manager.py
@@ -72,7 +72,7 @@ def mock_configuration_file_list(self, count=None, **kwargs):
                 if kwargs["name"] in all_stanzas:
                     stanza_mgr = client.Stanza(
                         self.service,
-                        "configs/conf-test/{0}/".format(kwargs["name"]),
+                        "configs/conf-test/{}/".format(kwargs["name"]),
                         skip_refresh=True,
                     )
                     stanza_mgr._state = common.record(
@@ -90,7 +90,7 @@ def mock_configuration_file_list(self, count=None, **kwargs):
                 for stanza_name, stanza in list(all_stanzas.items()):
                     stanza_mgr = client.Stanza(
                         self.service,
-                        "configs/conf-test/{0}/".format(stanza_name),
+                        "configs/conf-test/{}/".format(stanza_name),
                         skip_refresh=True,
                     )
                     stanza_mgr._state = common.record(
@@ -111,7 +111,7 @@ def mock_configuration_file_get(
 
     def mock_configuration_file_create(self, name, **params):
         stanza_mgr = client.Stanza(
-            self.service, "configs/conf-test/{0}/".format(name), skip_refresh=True
+            self.service, "configs/conf-test/{}/".format(name), skip_refresh=True
         )
         stanza_mgr._state = common.record({"title": name, "content": {}})
         return stanza_mgr
diff --git a/tests/test_file_monitor.py b/tests/test_file_monitor.py
index 5380bdd7..39b5aba8 100644
--- a/tests/test_file_monitor.py
+++ b/tests/test_file_monitor.py
@@ -22,7 +22,7 @@ def teardown_module(module):
     os.remove(_monitor_file)
 
 
-class TestFileChangesChecker(object):
+class TestFileChangesChecker:
     def test_check_changes(self, monkeypatch):
         self._called = False
 
@@ -44,7 +44,7 @@ def _callback_when_file_changes(changed):
         assert self._called is True
 
 
-class TestFileMonitor(object):
+class TestFileMonitor:
     def test_check_monitor(self, monkeypatch):
         self._called = False
 
diff --git a/tests/test_log.py b/tests/test_log.py
index 2fe3879f..17ff175e 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -48,7 +48,7 @@ def test2():
     test2()
 
 
-class TestLogs(object):
+class TestLogs:
     def test_get_logger(self, monkeypatch):
         logger = log.Logs().get_logger("logging")
 
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 6a85e6ad..9822420c 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -12,7 +12,7 @@
 from solnlib import metadata
 
 
-class TestMetadataReader(object):
+class TestMetadataReader:
     def test_get(self, monkeypatch):
         common.mock_splunkhome(monkeypatch)
 
diff --git a/tests/test_modular_input.py b/tests/test_modular_input.py
index 0592e44c..3463fa80 100644
--- a/tests/test_modular_input.py
+++ b/tests/test_modular_input.py
@@ -107,7 +107,7 @@ def do_run(self, inputs):
 
 
 def test_modular_input(monkeypatch):
-    class _MockStdout(object):
+    class _MockStdout:
         def __init__(self):
             self._buf = ""
 
diff --git a/tests/test_modular_input_event.py b/tests/test_modular_input_event.py
index 98398784..e931d16a 100644
--- a/tests/test_modular_input_event.py
+++ b/tests/test_modular_input_event.py
@@ -14,7 +14,7 @@ def to_sorted_json_string(obj):
     return json.dumps(json.loads(str(obj)), sort_keys=True)
 
 
-class TestXMLEvent(object):
+class TestXMLEvent:
     @classmethod
     def setup_class(cls):
         cls.xe1 = XMLEvent(
@@ -52,7 +52,7 @@ def setup_class(cls):
         )
 
         cls.xe4 = XMLEvent(
-            data=u"This is utf-8 \u2603 data4.",
+            data="This is utf-8 \u2603 data4.",
             time=1372274622.493,
             index="main",
             host="localhost",
@@ -83,11 +83,11 @@ def test_format_events(self, monkeypatch):
             '<stream><event stanza="test_scheme://test"><time>1372274622.493</time><index>main</index><host>localhost</host><source>Splunk</source><sourcetype>misc</sourcetype><data>This is a test data3.</data></event></stream>'
         ]
         assert XMLEvent.format_events([self.xe4]) == [
-            u'<stream><event stanza="test_scheme://test"><time>1372274622.493</time><index>main</index><host>localhost</host><source>Splunk</source><sourcetype>misc</sourcetype><data>This is utf-8 \u2603 data4.</data></event></stream>'
+            '<stream><event stanza="test_scheme://test"><time>1372274622.493</time><index>main</index><host>localhost</host><source>Splunk</source><sourcetype>misc</sourcetype><data>This is utf-8 \u2603 data4.</data></event></stream>'
         ]
 
 
-class TestHECEvent(object):
+class TestHECEvent:
     @classmethod
     def setup_class(cls):
         cls.he1 = HECEvent(
diff --git a/tests/test_modular_input_event_writer.py b/tests/test_modular_input_event_writer.py
index 9cf4aab5..ac95cc5b 100644
--- a/tests/test_modular_input_event_writer.py
+++ b/tests/test_modular_input_event_writer.py
@@ -14,7 +14,7 @@
 
 
 def test_classic_event_writer(monkeypatch):
-    class MockStdout(object):
+    class MockStdout:
         def __init__(self):
             self._buf = ""
             self.write_count = 0
diff --git a/tests/test_orphan_process_monitor.py b/tests/test_orphan_process_monitor.py
index 17db6399..41a97fbc 100644
--- a/tests/test_orphan_process_monitor.py
+++ b/tests/test_orphan_process_monitor.py
@@ -16,7 +16,7 @@ def _mock_getppid():
     return random.randint(1, 65535)
 
 
-class TestOrphanProcessChecker(object):
+class TestOrphanProcessChecker:
     def setup(self):
         self._called = False
 
@@ -34,7 +34,7 @@ def orphan_callback():
         assert self._called
 
 
-class TestOrphanProcessMonitor(object):
+class TestOrphanProcessMonitor:
     def setup(self):
         self._called = False
 
diff --git a/tests/test_server_info.py b/tests/test_server_info.py
index 35cf742d..0bfe55c5 100644
--- a/tests/test_server_info.py
+++ b/tests/test_server_info.py
@@ -12,7 +12,7 @@
 from splunklib import binding
 
 
-class TestServerInfo(object):
+class TestServerInfo:
     def test_server_name(self, monkeypatch):
         common.mock_splunkhome(monkeypatch)
         common.mock_serverinfo(monkeypatch)
@@ -69,7 +69,7 @@ def _mock_get(self, path_segment, owner=None, app=None, sharing=None, **query):
         assert si.get_shc_members() == [
             ("SHC01_SearchHead02_1_85", "https://192.168.1.85:8089"),
             ("SHC01_SearchHead03_1_86", "https://192.168.1.86:8089"),
-            ("SHC01_SearchHead01_1_84", u"https://192.168.1.84:8089"),
+            ("SHC01_SearchHead01_1_84", "https://192.168.1.84:8089"),
         ]
 
     def test_is_captain_ready(self, monkeypatch):