diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b1852675d..2f790048b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -33,9 +33,6 @@ Changes
   this is to prepare the removal of preloadconfig in pytest 4.0
   Thanks to `@RonnyPfannschmidt`_ for the PR.
 
-* Old-style classes have been changed to new-style classes in order to improve
-  compatibility with Python 2. Thanks to `@MichalTHEDUDE`_ and `@mandeep`_ for the PR (`#2147`_).
-
 * It is now possible to skip test classes from being collected by setting a
   ``__test__`` attribute to ``False`` in the class body (`#2007`_). Thanks
   to `@syre`_ for the report and `@lwm`_ for the PR.
@@ -123,7 +120,6 @@ Bug Fixes
 .. _#2013: https://github.com/pytest-dev/pytest/issues/2013
 .. _#2101: https://github.com/pytest-dev/pytest/pull/2101
 .. _#2166: https://github.com/pytest-dev/pytest/pull/2166
-.. _#2147: https://github.com/pytest-dev/pytest/issues/2147
 .. _#2208: https://github.com/pytest-dev/pytest/issues/2208
 .. _#2228: https://github.com/pytest-dev/pytest/issues/2228
 .. _#2308: https://github.com/pytest-dev/pytest/issues/2308
diff --git a/_pytest/_argcomplete.py b/_pytest/_argcomplete.py
index 12040b53a..8c93e4c92 100644
--- a/_pytest/_argcomplete.py
+++ b/_pytest/_argcomplete.py
@@ -62,7 +62,7 @@ import sys
 import os
 from glob import glob
 
-class FastFilesCompleter(object):
+class FastFilesCompleter:
     'Fast file completer class'
     def __init__(self, directories=True):
         self.directories = directories
diff --git a/_pytest/assertion/__init__.py b/_pytest/assertion/__init__.py
index cf9265330..acb034d86 100644
--- a/_pytest/assertion/__init__.py
+++ b/_pytest/assertion/__init__.py
@@ -57,7 +57,7 @@ class DummyRewriteHook(object):
         pass
 
 
-class AssertionState(object):
+class AssertionState:
     """State for the assertion plugin."""
 
     def __init__(self, config, mode):
diff --git a/_pytest/cacheprovider.py b/_pytest/cacheprovider.py
index 4cecc771d..ab08362ee 100755
--- a/_pytest/cacheprovider.py
+++ b/_pytest/cacheprovider.py
@@ -87,7 +87,7 @@ class Cache(object):
                 json.dump(value, f, indent=2, sort_keys=True)
 
 
-class LFPlugin(object):
+class LFPlugin:
     """ Plugin which implements the --lf (run last-failing) option """
     def __init__(self, config):
         self.config = config
diff --git a/_pytest/capture.py b/_pytest/capture.py
index c6fc80c0b..6bc3fc1f0 100644
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -57,7 +57,7 @@ def pytest_load_initial_conftests(early_config, parser, args):
         sys.stderr.write(err)
 
 
-class CaptureManager(object):
+class CaptureManager:
     def __init__(self, method):
         self._method = method
 
@@ -182,7 +182,7 @@ def capfd(request):
     return c
 
 
-class CaptureFixture(object):
+class CaptureFixture:
     def __init__(self, captureclass, request):
         self.captureclass = captureclass
         self.request = request
@@ -315,10 +315,10 @@ class MultiCapture(object):
         return (self.out.snap() if self.out is not None else "",
                 self.err.snap() if self.err is not None else "")
 
-class NoCapture(object):
+class NoCapture:
     __init__ = start = done = suspend = resume = lambda *args: None
 
-class FDCapture(object):
+class FDCapture:
     """ Capture IO to/from a given os-level filedescriptor. """
 
     def __init__(self, targetfd, tmpfile=None):
@@ -394,7 +394,7 @@ class FDCapture(object):
         os.write(self.targetfd_save, data)
 
 
-class SysCapture(object):
+class SysCapture:
     def __init__(self, fd, tmpfile=None):
         name = patchsysdict[fd]
         self._old = getattr(sys, name)
@@ -432,7 +432,7 @@ class SysCapture(object):
         self._old.flush()
 
 
-class DontReadFromInput(object):
+class DontReadFromInput:
     """Temporary stub class.  Ideally when stdin is accessed, the
     capturing should be turned off, with possibly all data captured
     so far sent to the screen.  This should be configurable, though,
diff --git a/_pytest/config.py b/_pytest/config.py
index 0a79cb5b1..0e65beec8 100644
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -63,7 +63,7 @@ def main(args=None, plugins=None):
             sys.stderr.write("ERROR: %s\n" %(msg,))
         return 4
 
-class cmdline(object):  # compatibility namespace
+class cmdline:  # compatibility namespace
     main = staticmethod(main)
 
 
@@ -464,7 +464,7 @@ def _get_plugin_specs_as_list(specs):
     return []
 
 
-class Parser(object):
+class Parser:
     """ Parser for command line arguments and ini-file values.
 
     :ivar extra_info: dict of generic param -> value to display in case
@@ -599,7 +599,7 @@ class ArgumentError(Exception):
             return self.msg
 
 
-class Argument(object):
+class Argument:
     """class that mimics the necessary behaviour of optparse.Option
 
     its currently a least effort implementation
@@ -729,7 +729,7 @@ class Argument(object):
         return 'Argument({0})'.format(', '.join(args))
 
 
-class OptionGroup(object):
+class OptionGroup:
     def __init__(self, name, description="", parser=None):
         self.name = name
         self.description = description
@@ -855,7 +855,7 @@ class CmdOptions(object):
     def copy(self):
         return CmdOptions(self.__dict__)
 
-class Notset(object):
+class Notset:
     def __repr__(self):
         return "<NOTSET>"
 
diff --git a/_pytest/debugging.py b/_pytest/debugging.py
index ad81fedc0..73a0a2ef5 100644
--- a/_pytest/debugging.py
+++ b/_pytest/debugging.py
@@ -40,8 +40,7 @@ def pytest_configure(config):
     pytestPDB._pdb_cls = pdb_cls
     config._cleanup.append(fin)
 
-
-class pytestPDB(object):
+class pytestPDB:
     """ Pseudo PDB that defers to the real pdb. """
     _pluginmanager = None
     _config = None
@@ -63,7 +62,7 @@ class pytestPDB(object):
         cls._pdb_cls().set_trace(frame)
 
 
-class PdbInvoke(object):
+class PdbInvoke:
     def pytest_exception_interact(self, node, call, report):
         capman = node.config.pluginmanager.getplugin("capturemanager")
         if capman:
diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py
index 066d7e86a..1a6e245c7 100644
--- a/_pytest/fixtures.py
+++ b/_pytest/fixtures.py
@@ -241,7 +241,7 @@ def fillfixtures(function):
 def get_direct_param_fixture_func(request):
     return request.param
 
-class FuncFixtureInfo(object):
+class FuncFixtureInfo:
     def __init__(self, argnames, names_closure, name2fixturedefs):
         self.argnames = argnames
         self.names_closure = names_closure
@@ -439,7 +439,7 @@ class FixtureRequest(FuncargnamesCompatAttr):
                 fixturedef = self._getnextfixturedef(argname)
             except FixtureLookupError:
                 if argname == "request":
-                    class PseudoFixtureDef(object):
+                    class PseudoFixtureDef:
                         cached_result = (self, [0], None)
                         scope = "function"
                     return PseudoFixtureDef
@@ -707,7 +707,7 @@ def call_fixture_func(fixturefunc, request, kwargs):
     return res
 
 
-class FixtureDef(object):
+class FixtureDef:
     """ A container for a factory definition. """
     def __init__(self, fixturemanager, baseid, argname, func, scope, params,
                  unittest=False, ids=None):
@@ -806,7 +806,7 @@ def pytest_fixture_setup(fixturedef, request):
     return result
 
 
-class FixtureFunctionMarker(object):
+class FixtureFunctionMarker:
     def __init__(self, scope, params, autouse=False, ids=None, name=None):
         self.scope = scope
         self.params = params
@@ -893,7 +893,7 @@ def pytestconfig(request):
     return request.config
 
 
-class FixtureManager(object):
+class FixtureManager:
     """
     pytest fixtures definitions and information is stored and managed
     from this class.
diff --git a/_pytest/main.py b/_pytest/main.py
index ef5b4f378..480810cc8 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -190,7 +190,7 @@ def pytest_ignore_collect(path, config):
     return False
 
 
-class FSHookProxy(object):
+class FSHookProxy:
     def __init__(self, fspath, pm, remove_mods):
         self.fspath = fspath
         self.pm = pm
diff --git a/_pytest/mark.py b/_pytest/mark.py
index c34df1239..8b40a4f6e 100644
--- a/_pytest/mark.py
+++ b/_pytest/mark.py
@@ -152,7 +152,7 @@ def pytest_collection_modifyitems(items, config):
         items[:] = remaining
 
 
-class MarkMapping(object):
+class MarkMapping:
     """Provides a local mapping for markers where item access
     resolves to True if the marker is present. """
     def __init__(self, keywords):
@@ -166,7 +166,7 @@ class MarkMapping(object):
         return name in self._mymarks
 
 
-class KeywordMapping(object):
+class KeywordMapping:
     """Provides a local mapping for keywords.
     Given a list of names, map any substring of one of these names to True.
     """
@@ -230,7 +230,7 @@ def pytest_unconfigure(config):
     MARK_GEN._config = getattr(config, '_old_mark_config', None)
 
 
-class MarkGenerator(object):
+class MarkGenerator:
     """ Factory for :class:`MarkDecorator` objects - exposed as
     a ``pytest.mark`` singleton instance.  Example::
 
@@ -270,8 +270,7 @@ def istestfunc(func):
     return hasattr(func, "__call__") and \
         getattr(func, "__name__", "<lambda>") != "<lambda>"
 
-
-class MarkDecorator(object):
+class MarkDecorator:
     """ A decorator for test functions and test classes.  When applied
     it will create :class:`MarkInfo` objects which may be
     :ref:`retrieved by hooks as item keywords <excontrolskip>`.
diff --git a/_pytest/monkeypatch.py b/_pytest/monkeypatch.py
index ec846f910..a70b23dda 100644
--- a/_pytest/monkeypatch.py
+++ b/_pytest/monkeypatch.py
@@ -89,7 +89,7 @@ def derive_importpath(import_path, raising):
     return attr, target
 
 
-class Notset(object):
+class Notset:
     def __repr__(self):
         return "<notset>"
 
@@ -97,7 +97,7 @@ class Notset(object):
 notset = Notset()
 
 
-class MonkeyPatch(object):
+class MonkeyPatch:
     """ Object returned by the ``monkeypatch`` fixture keeping a record of setattr/item/env/syspath changes.
     """
 
diff --git a/_pytest/pytester.py b/_pytest/pytester.py
index cc2e5a2ad..901caa340 100644
--- a/_pytest/pytester.py
+++ b/_pytest/pytester.py
@@ -167,7 +167,7 @@ def _pytest(request):
     """
     return PytestArg(request)
 
-class PytestArg(object):
+class PytestArg:
     def __init__(self, request):
         self.request = request
 
@@ -182,7 +182,7 @@ def get_public_names(l):
     return [x for x in l if x[0] != "_"]
 
 
-class ParsedCall(object):
+class ParsedCall:
     def __init__(self, name, kwargs):
         self.__dict__.update(kwargs)
         self._name = name
@@ -193,7 +193,7 @@ class ParsedCall(object):
         return "<ParsedCall %r(**%r)>" %(self._name, d)
 
 
-class HookRecorder(object):
+class HookRecorder:
     """Record all hooks called in a plugin manager.
 
     This wraps all the hook calls in the plugin manager, recording
@@ -337,7 +337,7 @@ def testdir(request, tmpdir_factory):
 
 
 rex_outcome = re.compile(r"(\d+) ([\w-]+)")
-class RunResult(object):
+class RunResult:
     """The result of running a command.
 
     Attributes:
@@ -383,7 +383,7 @@ class RunResult(object):
 
 
 
-class Testdir(object):
+class Testdir:
     """Temporary test directory with tools to test/run pytest itself.
 
     This is based on the ``tmpdir`` fixture but provides a number of
@@ -711,7 +711,7 @@ class Testdir(object):
 
         rec = []
 
-        class Collect(object):
+        class Collect:
             def pytest_configure(x, config):
                 rec.append(self.make_hook_recorder(config.pluginmanager))
 
@@ -722,7 +722,7 @@ class Testdir(object):
         if len(rec) == 1:
             reprec = rec.pop()
         else:
-            class reprec(object):
+            class reprec:
                 pass
         reprec.ret = ret
 
@@ -747,13 +747,13 @@ class Testdir(object):
                 reprec = self.inline_run(*args, **kwargs)
             except SystemExit as e:
 
-                class reprec(object):
+                class reprec:
                     ret = e.args[0]
 
             except Exception:
                 traceback.print_exc()
 
-                class reprec(object):
+                class reprec:
                     ret = 3
         finally:
             out, err = capture.readouterr()
@@ -1039,7 +1039,7 @@ def getdecoded(out):
                     py.io.saferepr(out),)
 
 
-class LineComp(object):
+class LineComp:
     def __init__(self):
         self.stringio = py.io.TextIO()
 
@@ -1055,7 +1055,7 @@ class LineComp(object):
         return LineMatcher(lines1).fnmatch_lines(lines2)
 
 
-class LineMatcher(object):
+class LineMatcher:
     """Flexible matching of text.
 
     This is a convenience class to test large texts like the output of
diff --git a/_pytest/runner.py b/_pytest/runner.py
index 87dd240c8..fd0b549a9 100644
--- a/_pytest/runner.py
+++ b/_pytest/runner.py
@@ -49,7 +49,7 @@ def pytest_sessionstart(session):
 def pytest_sessionfinish(session):
     session._setupstate.teardown_all()
 
-class NodeInfo(object):
+class NodeInfo:
     def __init__(self, location):
         self.location = location
 
@@ -144,7 +144,7 @@ def call_runtest_hook(item, when, **kwds):
     ihook = getattr(item.ihook, hookname)
     return CallInfo(lambda: ihook(item=item, **kwds), when=when)
 
-class CallInfo(object):
+class CallInfo:
     """ Result/Exception info a function invocation. """
     #: None or ExceptionInfo object.
     excinfo = None
diff --git a/_pytest/skipping.py b/_pytest/skipping.py
index e7922da7d..5af1ca404 100644
--- a/_pytest/skipping.py
+++ b/_pytest/skipping.py
@@ -72,7 +72,7 @@ def xfail(reason=""):
 xfail.Exception = XFailed
 
 
-class MarkEvaluator(object):
+class MarkEvaluator:
     def __init__(self, item, name):
         self.item = item
         self.name = name
diff --git a/_pytest/terminal.py b/_pytest/terminal.py
index 8c3bacf2d..e226d607b 100644
--- a/_pytest/terminal.py
+++ b/_pytest/terminal.py
@@ -84,7 +84,7 @@ def pytest_report_teststatus(report):
     return report.outcome, letter, report.outcome.upper()
 
 
-class WarningReport(object):
+class WarningReport:
     """
     Simple structure to hold warnings information captured by ``pytest_logwarning``.
     """
@@ -118,7 +118,7 @@ class WarningReport(object):
         return None
 
 
-class TerminalReporter(object):
+class TerminalReporter:
     def __init__(self, config, file=None):
         import _pytest.config
         self.config = config
diff --git a/_pytest/tmpdir.py b/_pytest/tmpdir.py
index 7c5fac17c..596014059 100644
--- a/_pytest/tmpdir.py
+++ b/_pytest/tmpdir.py
@@ -8,7 +8,7 @@ import py
 from _pytest.monkeypatch import MonkeyPatch
 
 
-class TempdirFactory(object):
+class TempdirFactory:
     """Factory for temporary directories under the common base temp directory.
 
     The base directory can be configured using the ``--basetemp`` option.