7 files changed, 23 insertions, 9 deletions
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
index 659c1a65..b39b7b8f 100644
--- a/setuptools/tests/test_build_meta.py
+++ b/setuptools/tests/test_build_meta.py
@@ -5,12 +5,14 @@ import pytest
 from .files import build_files
 from .textwrap import DALS
 
+__metaclass__ = type
+
 
 futures = pytest.importorskip('concurrent.futures')
 importlib = pytest.importorskip('importlib')
 
 
-class BuildBackendBase(object):
+class BuildBackendBase:
     def __init__(self, cwd=None, env={}, backend_name='setuptools.build_meta'):
         self.cwd = cwd
         self.env = env
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 3fc7fdaf..345d283c 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -36,8 +36,10 @@ import pkg_resources
 from . import contexts
 from .textwrap import DALS
 
+__metaclass__ = type
 
-class FakeDist(object):
+
+class FakeDist:
     def get_entry_map(self, group):
         if group != 'console_scripts':
             return {}
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index a70a93a8..1a100266 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -16,12 +16,14 @@ from .files import build_files
 from .textwrap import DALS
 from . import contexts
 
+__metaclass__ = type
+
 
 class Environment(str):
     pass
 
 
-class TestEggInfo(object):
+class TestEggInfo:
 
     setup_script = DALS("""
         from setuptools import setup
@@ -181,7 +183,7 @@ class TestEggInfo(object):
     )
     invalid_marker = "<=>++"
 
-    class RequiresTestHelper(object):
+    class RequiresTestHelper:
 
         @staticmethod
         def parametrize(*test_list, **format_dict):
diff --git a/setuptools/tests/test_glibc.py b/setuptools/tests/test_glibc.py
index 0a7cac0e..795fdc56 100644
--- a/setuptools/tests/test_glibc.py
+++ b/setuptools/tests/test_glibc.py
@@ -4,6 +4,8 @@ import pytest
 
 from setuptools.glibc import check_glibc_version
 
+__metaclass__ = type
+
 
 @pytest.fixture(params=[
     "2.20",
@@ -23,7 +25,7 @@ def bad_string(request):
     return request.param
 
 
-class TestGlibc(object):
+class TestGlibc:
     def test_manylinux1_check_glibc_version(self, two_twenty):
         """
         Test that the check_glibc_version function is robust against weird
diff --git a/setuptools/tests/test_manifest.py b/setuptools/tests/test_manifest.py
index 65eec7d9..c9533dda 100644
--- a/setuptools/tests/test_manifest.py
+++ b/setuptools/tests/test_manifest.py
@@ -18,6 +18,8 @@ from setuptools.tests.textwrap import DALS
 
 import pytest
 
+__metaclass__ = type
+
 py3_only = pytest.mark.xfail(six.PY2, reason="Test runs on Python 3 only")
 
 
@@ -157,7 +159,7 @@ def test_translated_pattern_mismatch(pattern_mismatch):
     assert not translate_pattern(pattern).match(target)
 
 
-class TempDirTestCase(object):
+class TempDirTestCase:
     def setup_method(self, method):
         self.temp_dir = tempfile.mkdtemp()
         self.old_cwd = os.getcwd()
diff --git a/setuptools/tests/test_pep425tags.py b/setuptools/tests/test_pep425tags.py
index 0f60e0ed..658784ac 100644
--- a/setuptools/tests/test_pep425tags.py
+++ b/setuptools/tests/test_pep425tags.py
@@ -4,8 +4,10 @@ from mock import patch
 
 from setuptools import pep425tags
 
+__metaclass__ = type
 
-class TestPEP425Tags(object):
+
+class TestPEP425Tags:
 
     def mock_get_config_var(self, **kwd):
         """
@@ -104,7 +106,7 @@ class TestPEP425Tags(object):
         self.abi_tag_unicode('dm', {'Py_DEBUG': True, 'WITH_PYMALLOC': True})
 
 
-class TestManylinux1Tags(object):
+class TestManylinux1Tags:
 
     @patch('setuptools.pep425tags.get_platform', lambda: 'linux_x86_64')
     @patch('setuptools.glibc.have_compatible_glibc',
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
index cf650868..6db5fa11 100644
--- a/setuptools/tests/test_wheel.py
+++ b/setuptools/tests/test_wheel.py
@@ -24,6 +24,8 @@ from .contexts import tempdir
 from .files import build_files
 from .textwrap import DALS
 
+__metaclass__ = type
+
 
 WHEEL_INFO_TESTS = (
     ('invalid.whl', ValueError),
@@ -148,7 +150,7 @@ def _check_wheel_install(filename, install_dir, install_tree_includes,
         assert requires_txt == dist.get_metadata('requires.txt').lstrip()
 
 
-class Record(object):
+class Record:
 
     def __init__(self, id, **kwargs):
         self._id = id