diff --git a/linkcheck/ansicolor.py b/linkcheck/ansicolor.py
index efd7c35c..d14d2fcc 100644
--- a/linkcheck/ansicolor.py
+++ b/linkcheck/ansicolor.py
@@ -276,7 +276,7 @@ class Colorizer:
         return getattr(self.fp, name)
 
 
-class ColoredStreamHandler (logging.StreamHandler):
+class ColoredStreamHandler(logging.StreamHandler):
     """Send colored log messages to streams (file-like objects)."""
 
     def __init__ (self, strm=None):
diff --git a/linkcheck/checker/dnsurl.py b/linkcheck/checker/dnsurl.py
index 379d5707..af152d8a 100644
--- a/linkcheck/checker/dnsurl.py
+++ b/linkcheck/checker/dnsurl.py
@@ -22,7 +22,7 @@ import socket
 from . import urlbase
 
 
-class DnsUrl (urlbase.UrlBase):
+class DnsUrl(urlbase.UrlBase):
     """
     Url link with dns scheme.
     """
diff --git a/linkcheck/checker/fileurl.py b/linkcheck/checker/fileurl.py
index 8362fa54..a3974e1c 100644
--- a/linkcheck/checker/fileurl.py
+++ b/linkcheck/checker/fileurl.py
@@ -88,7 +88,7 @@ def is_absolute_path (path):
     return path.startswith("/")
 
 
-class FileUrl (urlbase.UrlBase):
+class FileUrl(urlbase.UrlBase):
     """
     Url link with file scheme.
     """
diff --git a/linkcheck/checker/ftpurl.py b/linkcheck/checker/ftpurl.py
index 2095a47d..de70966b 100644
--- a/linkcheck/checker/ftpurl.py
+++ b/linkcheck/checker/ftpurl.py
@@ -25,7 +25,7 @@ from . import proxysupport, httpurl, internpaturl, get_index_html
 from .const import WARN_FTP_MISSING_SLASH
 
 
-class FtpUrl (internpaturl.InternPatternUrl, proxysupport.ProxySupport):
+class FtpUrl(internpaturl.InternPatternUrl, proxysupport.ProxySupport):
     """
     Url link with ftp scheme.
     """
diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
index bce20248..0af67e64 100644
--- a/linkcheck/checker/httpurl.py
+++ b/linkcheck/checker/httpurl.py
@@ -45,7 +45,8 @@ unicode_safe = strformat.unicode_safe
 # match for robots meta element content attribute
 nofollow_re = re.compile(r"\bnofollow\b", re.IGNORECASE)
 
-class HttpUrl (internpaturl.InternPatternUrl, proxysupport.ProxySupport):
+
+class HttpUrl(internpaturl.InternPatternUrl, proxysupport.ProxySupport):
     """
     Url link with http scheme.
     """
diff --git a/linkcheck/checker/ignoreurl.py b/linkcheck/checker/ignoreurl.py
index a7812e6c..ee1a8530 100644
--- a/linkcheck/checker/ignoreurl.py
+++ b/linkcheck/checker/ignoreurl.py
@@ -19,7 +19,7 @@ Handle ignored URLs.
 
 from . import unknownurl
 
-class IgnoreUrl (unknownurl.UnknownUrl):
+class IgnoreUrl(unknownurl.UnknownUrl):
     """Always ignored URL."""
 
     def is_ignored (self):
diff --git a/linkcheck/checker/internpaturl.py b/linkcheck/checker/internpaturl.py
index cbbfd6ad..c853c69e 100644
--- a/linkcheck/checker/internpaturl.py
+++ b/linkcheck/checker/internpaturl.py
@@ -45,7 +45,7 @@ def get_intern_pattern (url):
     return "^%s://%s%s" % tuple(args)
 
 
-class InternPatternUrl (urlbase.UrlBase):
+class InternPatternUrl(urlbase.UrlBase):
     """Class supporting an intern URL pattern."""
 
     def get_intern_pattern (self, url=None):
diff --git a/linkcheck/checker/mailtourl.py b/linkcheck/checker/mailtourl.py
index 691b324f..a9d02789 100644
--- a/linkcheck/checker/mailtourl.py
+++ b/linkcheck/checker/mailtourl.py
@@ -62,7 +62,7 @@ def is_missing_quote (addr):
 EMAIL_CGI_ADDRESS = ("to", "cc", "bcc")
 EMAIL_CGI_SUBJECT = "subject"
 
-class MailtoUrl (urlbase.UrlBase):
+class MailtoUrl(urlbase.UrlBase):
     """
     Url link with mailto scheme.
     """
diff --git a/linkcheck/checker/nntpurl.py b/linkcheck/checker/nntpurl.py
index 215b6a29..be46bc6b 100644
--- a/linkcheck/checker/nntpurl.py
+++ b/linkcheck/checker/nntpurl.py
@@ -28,7 +28,7 @@ from .const import WARN_NNTP_NO_SERVER, WARN_NNTP_NO_NEWSGROUP
 
 random.seed()
 
-class NntpUrl (urlbase.UrlBase):
+class NntpUrl(urlbase.UrlBase):
     """
     Url link with NNTP scheme.
     """
diff --git a/linkcheck/checker/telneturl.py b/linkcheck/checker/telneturl.py
index bf4d5441..4598e6d8 100644
--- a/linkcheck/checker/telneturl.py
+++ b/linkcheck/checker/telneturl.py
@@ -27,7 +27,7 @@ def encode(s, encoding="iso-8859-1", errors="ignore"):
     return s.encode(encoding, errors)
 
 
-class TelnetUrl (urlbase.UrlBase):
+class TelnetUrl(urlbase.UrlBase):
     """
     Url link with telnet scheme.
     """
diff --git a/linkcheck/checker/unknownurl.py b/linkcheck/checker/unknownurl.py
index 76456b04..b8c1abf8 100644
--- a/linkcheck/checker/unknownurl.py
+++ b/linkcheck/checker/unknownurl.py
@@ -21,7 +21,7 @@ import re
 from . import urlbase
 
 
-class UnknownUrl (urlbase.UrlBase):
+class UnknownUrl(urlbase.UrlBase):
     """Handle unknown or just plain broken URLs."""
 
     def build_url (self):
diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py
index 369c7dea..59e03180 100644
--- a/linkcheck/configuration/__init__.py
+++ b/linkcheck/configuration/__init__.py
@@ -144,7 +144,7 @@ def get_certifi_file():
 
 
 # dynamic options
-class Configuration (dict):
+class Configuration(dict):
     """
     Storage for configuration options. Options can both be given from
     the command line as well as from configuration files.
diff --git a/linkcheck/configuration/confparse.py b/linkcheck/configuration/confparse.py
index 94908d91..28960d41 100644
--- a/linkcheck/configuration/confparse.py
+++ b/linkcheck/configuration/confparse.py
@@ -30,7 +30,7 @@ def read_multiline (value):
         yield line
 
 
-class LCConfigParser (RawConfigParser):
+class LCConfigParser(RawConfigParser):
     """
     Parse a LinkChecker configuration file.
     """
diff --git a/linkcheck/containers.py b/linkcheck/containers.py
index 54b6e62e..01e2e9f8 100644
--- a/linkcheck/containers.py
+++ b/linkcheck/containers.py
@@ -17,7 +17,7 @@
 Special container classes.
 """
 
-class LFUCache (dict):
+class LFUCache(dict):
     """Limited cache which purges least frequently used items."""
 
     def __init__ (self, size=1000):
diff --git a/linkcheck/director/interrupt.py b/linkcheck/director/interrupt.py
index a011ae21..bf9f0ad7 100644
--- a/linkcheck/director/interrupt.py
+++ b/linkcheck/director/interrupt.py
@@ -19,7 +19,7 @@ from . import task
 from .. import log, LOG_CHECK, strformat
 
 
-class Interrupt (task.CheckedTask):
+class Interrupt(task.CheckedTask):
     """Thread that raises KeyboardInterrupt after a specified duration.
     This gives us a portable SIGALRM implementation.
     The duration is checked every 5 seconds.
diff --git a/linkcheck/director/status.py b/linkcheck/director/status.py
index f27aa297..4825e90f 100644
--- a/linkcheck/director/status.py
+++ b/linkcheck/director/status.py
@@ -18,7 +18,7 @@ import time
 from . import task
 
 
-class Status (task.LoggedCheckedTask):
+class Status(task.LoggedCheckedTask):
     """Thread that gathers and logs the status periodically."""
 
     def __init__ (self, aggregator, wait_seconds):
diff --git a/linkcheck/director/task.py b/linkcheck/director/task.py
index 044d668e..2bd2da83 100644
--- a/linkcheck/director/task.py
+++ b/linkcheck/director/task.py
@@ -20,7 +20,7 @@ from .. import threader
 from . import console
 
 
-class CheckedTask (threader.StoppableThread):
+class CheckedTask(threader.StoppableThread):
     """Stoppable URL check task, handling error conditions while running."""
 
     def run (self):
@@ -43,7 +43,7 @@ class CheckedTask (threader.StoppableThread):
         pass
 
 
-class LoggedCheckedTask (CheckedTask):
+class LoggedCheckedTask(CheckedTask):
     """URL check task with a logger instance and internal error handling."""
 
     def __init__ (self, logger):
diff --git a/linkcheck/i18n.py b/linkcheck/i18n.py
index 93497850..4f197d86 100644
--- a/linkcheck/i18n.py
+++ b/linkcheck/i18n.py
@@ -37,7 +37,7 @@ def install_builtin (translator, do_unicode):
     # also install ngettext
     builtins.__dict__['_n'] = translator.ngettext
 
-class Translator (gettext.GNUTranslations):
+class Translator(gettext.GNUTranslations):
     """A translation class always installing its gettext methods into the
     default namespace."""
 
@@ -46,7 +46,7 @@ class Translator (gettext.GNUTranslations):
         install_builtin(self, do_unicode)
 
 
-class NullTranslator (gettext.NullTranslations):
+class NullTranslator(gettext.NullTranslations):
     """A dummy translation class always installing its gettext methods into
     the default namespace."""
 
diff --git a/linkcheck/logger/__init__.py b/linkcheck/logger/__init__.py
index c3e124df..852c49bd 100644
--- a/linkcheck/logger/__init__.py
+++ b/linkcheck/logger/__init__.py
@@ -129,7 +129,7 @@ class LogStatistics:
         self.internal_errors += 1
 
 
-class _Logger (abc.ABC):
+class _Logger(abc.ABC):
     """
     Base class for logging of checked urls. It defines the public API
     (see below) and offers basic functionality for all loggers.
diff --git a/linkcheck/logger/blacklist.py b/linkcheck/logger/blacklist.py
index 01f10fb1..8a961ad7 100644
--- a/linkcheck/logger/blacklist.py
+++ b/linkcheck/logger/blacklist.py
@@ -23,7 +23,7 @@ from linkcheck.configuration import get_user_data
 from . import _Logger
 
 
-class BlacklistLogger (_Logger):
+class BlacklistLogger(_Logger):
     """
     Updates a blacklist of wrong links. If a link on the blacklist
     is working (again), it is removed from the list. So after n days
diff --git a/linkcheck/logger/csvlog.py b/linkcheck/logger/csvlog.py
index 54958a90..3857b3a0 100644
--- a/linkcheck/logger/csvlog.py
+++ b/linkcheck/logger/csvlog.py
@@ -30,7 +30,7 @@ Columns = (
 )
 
 
-class CSVLogger (_Logger):
+class CSVLogger(_Logger):
     """
     CSV output, consisting of one line per entry. Entries are
     separated by a separator (a semicolon per default).
diff --git a/linkcheck/logger/customxml.py b/linkcheck/logger/customxml.py
index 6ac8b22e..6f28932a 100644
--- a/linkcheck/logger/customxml.py
+++ b/linkcheck/logger/customxml.py
@@ -21,7 +21,7 @@ from .. import strformat
 from builtins import str as str_text
 
 
-class CustomXMLLogger (xmllog._XMLLogger):
+class CustomXMLLogger(xmllog._XMLLogger):
     """
     XML custom output for easy post-processing.
     """
diff --git a/linkcheck/logger/dot.py b/linkcheck/logger/dot.py
index 4e3416dd..65329942 100644
--- a/linkcheck/logger/dot.py
+++ b/linkcheck/logger/dot.py
@@ -20,7 +20,7 @@ http://www.graphviz.org/doc/info/lang.html
 from .graph import _GraphLogger
 
 
-class DOTLogger (_GraphLogger):
+class DOTLogger(_GraphLogger):
     """
     Generates .dot sitemap graphs. Use graphviz to see the sitemap graph.
     """
diff --git a/linkcheck/logger/gml.py b/linkcheck/logger/gml.py
index 65a535a9..b8660e42 100644
--- a/linkcheck/logger/gml.py
+++ b/linkcheck/logger/gml.py
@@ -19,7 +19,7 @@ A gml logger.
 from .graph import _GraphLogger
 
 
-class GMLLogger (_GraphLogger):
+class GMLLogger(_GraphLogger):
     """GML means Graph Modeling Language. Use a GML tool to see
     the sitemap graph."""
 
diff --git a/linkcheck/logger/graph.py b/linkcheck/logger/graph.py
index b20105ec..414b7a76 100644
--- a/linkcheck/logger/graph.py
+++ b/linkcheck/logger/graph.py
@@ -21,7 +21,7 @@ from ..decorators import notimplemented
 import re
 
 
-class _GraphLogger (_Logger):
+class _GraphLogger(_Logger):
     """Provide base method to get node data."""
 
     def __init__ (self, **kwargs):
diff --git a/linkcheck/logger/gxml.py b/linkcheck/logger/gxml.py
index 55bd8873..1297cfb5 100644
--- a/linkcheck/logger/gxml.py
+++ b/linkcheck/logger/gxml.py
@@ -21,7 +21,7 @@ from .xmllog import _XMLLogger
 from .graph import _GraphLogger
 
 
-class GraphXMLLogger (_XMLLogger, _GraphLogger):
+class GraphXMLLogger(_XMLLogger, _GraphLogger):
     """XML output mirroring the GML structure. Easy to parse with any XML
     tool."""
 
diff --git a/linkcheck/logger/html.py b/linkcheck/logger/html.py
index 259cf311..64202182 100644
--- a/linkcheck/logger/html.py
+++ b/linkcheck/logger/html.py
@@ -59,7 +59,7 @@ HTML_HEADER = """<!DOCTYPE HTML>
 """
 
 
-class HtmlLogger (_Logger):
+class HtmlLogger(_Logger):
     """Logger with HTML output."""
 
     LoggerName = 'html'
diff --git a/linkcheck/logger/none.py b/linkcheck/logger/none.py
index e2b6cbf0..26e3547d 100644
--- a/linkcheck/logger/none.py
+++ b/linkcheck/logger/none.py
@@ -19,7 +19,7 @@ A dummy logger.
 from . import _Logger
 
 
-class NoneLogger (_Logger):
+class NoneLogger(_Logger):
     """
     Dummy logger printing nothing.
     """
diff --git a/linkcheck/logger/sitemapxml.py b/linkcheck/logger/sitemapxml.py
index aec5dfd2..792d94b7 100644
--- a/linkcheck/logger/sitemapxml.py
+++ b/linkcheck/logger/sitemapxml.py
@@ -32,7 +32,7 @@ ChangeFreqs = (
 HTTP_SCHEMES = ('http:', 'https:')
 HTML_TYPES = ('text/html', "application/xhtml+xml")
 
-class SitemapXmlLogger (xmllog._XMLLogger):
+class SitemapXmlLogger(xmllog._XMLLogger):
     """Sitemap XML output according to http://www.sitemaps.org/protocol.html
     """
 
diff --git a/linkcheck/logger/sql.py b/linkcheck/logger/sql.py
index 6e6f3080..cd4e79ba 100644
--- a/linkcheck/logger/sql.py
+++ b/linkcheck/logger/sql.py
@@ -45,7 +45,7 @@ def intify (s):
     return 0
 
 
-class SQLLogger (_Logger):
+class SQLLogger(_Logger):
     """
     SQL output, should work with any SQL database (not tested).
     """
diff --git a/linkcheck/logger/text.py b/linkcheck/logger/text.py
index dd80717b..1a4aafe1 100644
--- a/linkcheck/logger/text.py
+++ b/linkcheck/logger/text.py
@@ -22,7 +22,7 @@ from .. import ansicolor, strformat, configuration, i18n
 from builtins import str as str_text
 
 
-class TextLogger (_Logger):
+class TextLogger(_Logger):
     """
     A text logger, colorizing the output if possible.
 
diff --git a/linkcheck/logger/xmllog.py b/linkcheck/logger/xmllog.py
index 77a5570f..c8c98f15 100644
--- a/linkcheck/logger/xmllog.py
+++ b/linkcheck/logger/xmllog.py
@@ -43,7 +43,7 @@ def xmlquoteattr (s):
     return xml.sax.saxutils.escape(s, xmlattr_entities)
 
 
-class _XMLLogger (_Logger):
+class _XMLLogger(_Logger):
     """Base class for XML output; easy to parse with any XML tool."""
 
     def __init__ (self, **kwargs):
diff --git a/linkcheck/plugins/viruscheck.py b/linkcheck/plugins/viruscheck.py
index f8dae6d5..7358f19b 100644
--- a/linkcheck/plugins/viruscheck.py
+++ b/linkcheck/plugins/viruscheck.py
@@ -65,7 +65,7 @@ class VirusCheck(_ContentPlugin):
         return config
 
 
-class ClamavError (Exception):
+class ClamavError(Exception):
     """Raised on clamav errors."""
     pass
 
@@ -149,7 +149,7 @@ def get_sockinfo (host, port=None):
     return socket.getaddrinfo(host, port, family, socktype)
 
 
-class ClamavConfig (dict):
+class ClamavConfig(dict):
     """Clamav configuration wrapper, with clamd connection method."""
 
     def __init__ (self, filename):
diff --git a/linkcheck/threader.py b/linkcheck/threader.py
index 2704bc40..5f6ab835 100644
--- a/linkcheck/threader.py
+++ b/linkcheck/threader.py
@@ -19,7 +19,7 @@ Support for managing threads.
 import threading
 
 
-class StoppableThread (threading.Thread):
+class StoppableThread(threading.Thread):
     """Thread class with a stop() method. The thread itself has to check
     regularly for the stopped() condition."""
 
diff --git a/setup.py b/setup.py
index 8a1bb1fe..65354c7a 100755
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ def get_portable():
     return os.environ.get('LINKCHECKER_PORTABLE', '0')
 
 
-class MyInstallLib (install_lib):
+class MyInstallLib(install_lib):
     """Custom library installation."""
 
     def install (self):
@@ -155,7 +155,7 @@ class MyInstallLib (install_lib):
         return outs
 
 
-class MyInstallData (install_data):
+class MyInstallData(install_data):
     """Fix file permissions."""
 
     def run (self):
@@ -205,7 +205,7 @@ class MyInstallData (install_data):
                 os.chmod(path, mode)
 
 
-class MyDistribution (Distribution):
+class MyDistribution(Distribution):
     """Custom distribution class generating config file."""
 
     def __init__ (self, attrs):
@@ -284,7 +284,7 @@ def check_manifest ():
         print('\nMissing: '.join(err))
 
 
-class MyBuild (build):
+class MyBuild(build):
     """Custom build command."""
 
     def run (self):
@@ -293,7 +293,7 @@ class MyBuild (build):
         build.run(self)
 
 
-class MyClean (clean):
+class MyClean(clean):
     """Custom clean command."""
 
     def run (self):
@@ -308,7 +308,7 @@ class MyClean (clean):
         clean.run(self)
 
 
-class MySdist (sdist):
+class MySdist(sdist):
     """Custom sdist command."""
 
     def get_file_list (self):
diff --git a/tests/checker/__init__.py b/tests/checker/__init__.py
index 20ee7f2d..cb0e8dc0 100644
--- a/tests/checker/__init__.py
+++ b/tests/checker/__init__.py
@@ -32,7 +32,7 @@ from builtins import str as str_text
 get_url_from = linkcheck.checker.get_url_from
 
 
-class TestLogger (linkcheck.logger._Logger):
+class TestLogger(linkcheck.logger._Logger):
     """
     Output logger for automatic regression tests.
     """
@@ -183,7 +183,7 @@ def get_test_aggregate (confargs, logargs, logger=TestLogger):
     return linkcheck.director.get_aggregate(config)
 
 
-class LinkCheckTest (unittest.TestCase):
+class LinkCheckTest(unittest.TestCase):
     """
     Functional test class with ability to test local files.
     """
@@ -273,7 +273,7 @@ class LinkCheckTest (unittest.TestCase):
             self.fail(os.linesep.join(l))
 
 
-class MailTest (LinkCheckTest):
+class MailTest(LinkCheckTest):
     """Test mailto: link checking."""
 
     def mail_valid (self, addr, **kwargs):
diff --git a/tests/checker/ftpserver.py b/tests/checker/ftpserver.py
index 69df0d9d..f6a4e72c 100644
--- a/tests/checker/ftpserver.py
+++ b/tests/checker/ftpserver.py
@@ -26,7 +26,7 @@ from . import LinkCheckTest
 
 TIMEOUT = 5
 
-class FtpServerTest (LinkCheckTest):
+class FtpServerTest(LinkCheckTest):
     """Start/stop an FTP server that can be used for testing."""
 
     def __init__ (self, methodName='runTest'):
diff --git a/tests/checker/httpserver.py b/tests/checker/httpserver.py
index b90a9836..d2763ebf 100644
--- a/tests/checker/httpserver.py
+++ b/tests/checker/httpserver.py
@@ -30,7 +30,7 @@ from . import LinkCheckTest
 from .. import get_file
 
 
-class StoppableHttpRequestHandler (SimpleHTTPRequestHandler):
+class StoppableHttpRequestHandler(SimpleHTTPRequestHandler):
     """
     HTTP request handler with QUIT stopping the server.
     """
@@ -55,7 +55,7 @@ StoppableHttpRequestHandler.extensions_map.update({
 })
 
 
-class StoppableHttpServer (HTTPServer):
+class StoppableHttpServer(HTTPServer):
     """
     HTTP server that reacts to self.stop flag.
     """
@@ -69,7 +69,7 @@ class StoppableHttpServer (HTTPServer):
             self.handle_request()
 
 
-class NoQueryHttpRequestHandler (StoppableHttpRequestHandler):
+class NoQueryHttpRequestHandler(StoppableHttpRequestHandler):
     """
     Handler ignoring the query part of requests and sending dummy directory
     listings.
@@ -147,7 +147,7 @@ class NoQueryHttpRequestHandler (StoppableHttpRequestHandler):
         return f
 
 
-class HttpServerTest (LinkCheckTest):
+class HttpServerTest(LinkCheckTest):
     """
     Start/stop an HTTP server that can be used for testing.
     """
@@ -243,7 +243,7 @@ def get_cookie (maxage=2000):
     return "; ".join('%s="%s"' % (key, value) for key, value in data)
 
 
-class CookieRedirectHttpRequestHandler (NoQueryHttpRequestHandler):
+class CookieRedirectHttpRequestHandler(NoQueryHttpRequestHandler):
     """Handler redirecting certain requests, and setting cookies."""
 
     def end_headers (self):
diff --git a/tests/checker/telnetserver.py b/tests/checker/telnetserver.py
index 8d6d4b49..db6474ca 100644
--- a/tests/checker/telnetserver.py
+++ b/tests/checker/telnetserver.py
@@ -25,7 +25,7 @@ from . import LinkCheckTest
 
 TIMEOUT = 5
 
-class TelnetServerTest (LinkCheckTest):
+class TelnetServerTest(LinkCheckTest):
     """Start/stop a Telnet server that can be used for testing."""
 
     def __init__ (self, methodName='runTest'):
diff --git a/tests/checker/test_anchor.py b/tests/checker/test_anchor.py
index 9b652dc1..20dc012d 100644
--- a/tests/checker/test_anchor.py
+++ b/tests/checker/test_anchor.py
@@ -19,7 +19,7 @@ Test html anchor parsing and checking.
 from . import LinkCheckTest
 
 
-class TestAnchor (LinkCheckTest):
+class TestAnchor(LinkCheckTest):
     """
     Test anchor checking of HTML pages.
     """
diff --git a/tests/checker/test_base.py b/tests/checker/test_base.py
index 3321f9ae..3e6b2379 100644
--- a/tests/checker/test_base.py
+++ b/tests/checker/test_base.py
@@ -19,7 +19,7 @@ Test html <base> tag parsing.
 from . import LinkCheckTest
 
 
-class TestBase (LinkCheckTest):
+class TestBase(LinkCheckTest):
     """
     Test links of base*.html files.
     """
diff --git a/tests/checker/test_bookmarks.py b/tests/checker/test_bookmarks.py
index 80b7b3ee..8887a311 100644
--- a/tests/checker/test_bookmarks.py
+++ b/tests/checker/test_bookmarks.py
@@ -21,7 +21,7 @@ from .. import need_network, need_biplist
 import os
 
 
-class TestBookmarks (LinkCheckTest):
+class TestBookmarks(LinkCheckTest):
     """
     Test bookmark link checking and content parsing.
     """
diff --git a/tests/checker/test_charsets.py b/tests/checker/test_charsets.py
index 04df0f7f..cf5e30c7 100644
--- a/tests/checker/test_charsets.py
+++ b/tests/checker/test_charsets.py
@@ -19,7 +19,7 @@ Test html <base> tag parsing.
 from . import LinkCheckTest
 
 
-class TestBase (LinkCheckTest):
+class TestBase(LinkCheckTest):
     """
     Test, if charset encoding is done right.
     The linkchecker should translate the encoding
diff --git a/tests/checker/test_error.py b/tests/checker/test_error.py
index 23a21d0b..e8a13b32 100644
--- a/tests/checker/test_error.py
+++ b/tests/checker/test_error.py
@@ -20,7 +20,7 @@ Test error checking.
 from . import LinkCheckTest
 
 
-class TestError (LinkCheckTest):
+class TestError(LinkCheckTest):
     """
     Test unrecognized or syntactically wrong links.
     """
diff --git a/tests/checker/test_file.py b/tests/checker/test_file.py
index d296dc0c..95345d69 100644
--- a/tests/checker/test_file.py
+++ b/tests/checker/test_file.py
@@ -42,7 +42,7 @@ def unzip (filename, targetdir):
                 outfile.close()
 
 
-class TestFile (LinkCheckTest):
+class TestFile(LinkCheckTest):
     """
     Test file:// link checking (and file content parsing).
     """
diff --git a/tests/checker/test_frames.py b/tests/checker/test_frames.py
index e4e4f700..b523a886 100644
--- a/tests/checker/test_frames.py
+++ b/tests/checker/test_frames.py
@@ -19,7 +19,7 @@ Test html <frame> tag parsing.
 from . import LinkCheckTest
 
 
-class TestFrames (LinkCheckTest):
+class TestFrames(LinkCheckTest):
     """
     Test link checking of HTML framesets.
     """
diff --git a/tests/checker/test_ftp.py b/tests/checker/test_ftp.py
index 38b24859..ab626cce 100644
--- a/tests/checker/test_ftp.py
+++ b/tests/checker/test_ftp.py
@@ -20,7 +20,7 @@ from .. import need_pyftpdlib
 from .ftpserver import FtpServerTest
 
 
-class TestFtp (FtpServerTest):
+class TestFtp(FtpServerTest):
     """Test ftp: link checking."""
 
     @need_pyftpdlib
diff --git a/tests/checker/test_http.py b/tests/checker/test_http.py
index 96780bc0..9f3433a8 100644
--- a/tests/checker/test_http.py
+++ b/tests/checker/test_http.py
@@ -22,7 +22,7 @@ import pytest
 from tests import need_network
 from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler
 
-class TestHttp (HttpServerTest):
+class TestHttp(HttpServerTest):
     """Test http:// link checking."""
 
     def __init__(self, methodName='runTest'):
diff --git a/tests/checker/test_http_misc.py b/tests/checker/test_http_misc.py
index 31995c38..0048c3b0 100644
--- a/tests/checker/test_http_misc.py
+++ b/tests/checker/test_http_misc.py
@@ -19,7 +19,7 @@ Test http checking.
 from .httpserver import HttpServerTest
 from tests import need_network
 
-class TestHttpMisc (HttpServerTest):
+class TestHttpMisc(HttpServerTest):
     """Test http:// misc link checking."""
 
     @need_network
diff --git a/tests/checker/test_http_redirect.py b/tests/checker/test_http_redirect.py
index fa966bcc..6e3a4920 100644
--- a/tests/checker/test_http_redirect.py
+++ b/tests/checker/test_http_redirect.py
@@ -19,7 +19,7 @@ Test http checking.
 from tests import need_network
 from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler
 
-class TestHttpRedirect (HttpServerTest):
+class TestHttpRedirect(HttpServerTest):
     """Test http:// link redirection checking."""
 
     def __init__(self, methodName='runTest'):
diff --git a/tests/checker/test_http_robots.py b/tests/checker/test_http_robots.py
index 3c3d91d1..cfb04255 100644
--- a/tests/checker/test_http_robots.py
+++ b/tests/checker/test_http_robots.py
@@ -18,7 +18,7 @@ Test http checking.
 """
 from .httpserver import HttpServerTest
 
-class TestHttpRobots (HttpServerTest):
+class TestHttpRobots(HttpServerTest):
     """Test robots.txt link checking behaviour."""
 
     def test_html (self):
diff --git a/tests/checker/test_https_redirect.py b/tests/checker/test_https_redirect.py
index 88d78948..1209061f 100644
--- a/tests/checker/test_https_redirect.py
+++ b/tests/checker/test_https_redirect.py
@@ -18,7 +18,7 @@ Test http checking.
 """
 from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler
 
-class TestHttpsRedirect (HttpServerTest):
+class TestHttpsRedirect(HttpServerTest):
     """Test https:// link redirection checking."""
 
     def __init__(self, methodName='runTest'):
@@ -44,7 +44,7 @@ class TestHttpsRedirect (HttpServerTest):
         self.direct(url, resultlines, recursionlevel=0)
 
 
-class RedirectHttpsRequestHandler (CookieRedirectHttpRequestHandler):
+class RedirectHttpsRequestHandler(CookieRedirectHttpRequestHandler):
 
     def redirect (self):
         """Redirect request."""
diff --git a/tests/checker/test_internpat.py b/tests/checker/test_internpat.py
index 0ab98b68..060e0853 100644
--- a/tests/checker/test_internpat.py
+++ b/tests/checker/test_internpat.py
@@ -21,7 +21,7 @@ import linkcheck.configuration
 from .__init__ import LinkCheckTest, get_url_from
 
 
-class TestInternpat (LinkCheckTest):
+class TestInternpat(LinkCheckTest):
     """Test internal pattern."""
 
     def test_trailing_slash (self):
diff --git a/tests/checker/test_mail_bad.py b/tests/checker/test_mail_bad.py
index c1f3397b..df529efe 100644
--- a/tests/checker/test_mail_bad.py
+++ b/tests/checker/test_mail_bad.py
@@ -19,7 +19,7 @@ Test mail checking of bad mail addresses.
 from . import MailTest
 
 
-class TestMailBad (MailTest):
+class TestMailBad(MailTest):
     """Test mailto: link checking."""
 
     def test_error_mail (self):
diff --git a/tests/checker/test_mail_good.py b/tests/checker/test_mail_good.py
index bf4b8a3f..72611ab8 100644
--- a/tests/checker/test_mail_good.py
+++ b/tests/checker/test_mail_good.py
@@ -20,7 +20,7 @@ from tests import need_network
 from . import MailTest
 
 
-class TestMailGood (MailTest):
+class TestMailGood(MailTest):
     """
     Test mailto: link checking.
     """
diff --git a/tests/checker/test_misc.py b/tests/checker/test_misc.py
index b997812b..b843b5c4 100644
--- a/tests/checker/test_misc.py
+++ b/tests/checker/test_misc.py
@@ -20,7 +20,7 @@ from tests import need_network
 from . import LinkCheckTest
 
 
-class TestMisc (LinkCheckTest):
+class TestMisc(LinkCheckTest):
     """
     Test misc link types.
     """
diff --git a/tests/checker/test_news.py b/tests/checker/test_news.py
index df45eaed..9b4a9ad3 100644
--- a/tests/checker/test_news.py
+++ b/tests/checker/test_news.py
@@ -32,7 +32,7 @@ NNTP_TIMEOUT_SECS = 30
 
 # disabled for now until some stable news server comes up
 @pytest.mark.skip(reason="disabled for now until some stable news server comes up")
-class TestNews (LinkCheckTest):
+class TestNews(LinkCheckTest):
     """Test nntp: and news: link checking."""
 
     def newstest (self, url, resultlines):
diff --git a/tests/checker/test_noproxy.py b/tests/checker/test_noproxy.py
index 48f0d678..a7ec2ec4 100644
--- a/tests/checker/test_noproxy.py
+++ b/tests/checker/test_noproxy.py
@@ -20,7 +20,7 @@ from test.support import EnvironmentVarGuard
 
 from . import httpserver
 
-class TestProxy (httpserver.HttpServerTest):
+class TestProxy(httpserver.HttpServerTest):
     """Test no_proxy env var handling."""
 
     def test_noproxy (self):
diff --git a/tests/checker/test_telnet.py b/tests/checker/test_telnet.py
index fd44a29b..e2ff97e4 100644
--- a/tests/checker/test_telnet.py
+++ b/tests/checker/test_telnet.py
@@ -19,7 +19,7 @@ Test telnet checking.
 from .telnetserver import TelnetServerTest
 
 
-class TestTelnet (TelnetServerTest):
+class TestTelnet(TelnetServerTest):
     """Test telnet: link checking."""
 
     def test_telnet_error (self):
diff --git a/tests/checker/test_unknown.py b/tests/checker/test_unknown.py
index 1786cdb6..e495f52b 100644
--- a/tests/checker/test_unknown.py
+++ b/tests/checker/test_unknown.py
@@ -19,7 +19,7 @@ Test checking of unknown URLs.
 from . import LinkCheckTest
 
 
-class TestUnknown (LinkCheckTest):
+class TestUnknown(LinkCheckTest):
     """Test unknown URL scheme checking."""
 
     def test_skype (self):
diff --git a/tests/checker/test_whitespace.py b/tests/checker/test_whitespace.py
index b2bc03af..798aa4c2 100644
--- a/tests/checker/test_whitespace.py
+++ b/tests/checker/test_whitespace.py
@@ -20,7 +20,7 @@ from tests import need_network
 from . import LinkCheckTest
 
 
-class TestWhitespace (LinkCheckTest):
+class TestWhitespace(LinkCheckTest):
     """
     Test whitespace in URLs.
     """
diff --git a/tests/configuration/test_config.py b/tests/configuration/test_config.py
index 3d9408fc..a614aa3d 100644
--- a/tests/configuration/test_config.py
+++ b/tests/configuration/test_config.py
@@ -31,7 +31,7 @@ def get_file (filename=None):
     return str_text(directory)
 
 
-class TestConfig (unittest.TestCase):
+class TestConfig(unittest.TestCase):
     """Test configuration parsing."""
 
     def test_confparse (self):
diff --git a/tests/logger/test_csvlog.py b/tests/logger/test_csvlog.py
index c533a685..b3d44fb4 100644
--- a/tests/logger/test_csvlog.py
+++ b/tests/logger/test_csvlog.py
@@ -19,7 +19,7 @@ import os
 from linkcheck.logger.csvlog import CSVLogger
 
 
-class TestCsvLogger (unittest.TestCase):
+class TestCsvLogger(unittest.TestCase):
 
     def test_parts (self):
         args = dict(
diff --git a/tests/test_cgi.py b/tests/test_cgi.py
index 69956d71..22e0e906 100644
--- a/tests/test_cgi.py
+++ b/tests/test_cgi.py
@@ -23,7 +23,7 @@ from wsgiref.util import setup_testing_defaults
 from linkcheck.lc_cgi import checkform, checklink, LCFormError, application
 from linkcheck.strformat import limit
 
-class TestWsgi (unittest.TestCase):
+class TestWsgi(unittest.TestCase):
     """Test wsgi application."""
 
     def test_form_valid_url (self):
diff --git a/tests/test_clamav.py b/tests/test_clamav.py
index 9276f307..6aea6b2e 100644
--- a/tests/test_clamav.py
+++ b/tests/test_clamav.py
@@ -21,7 +21,7 @@ from tests import need_clamav
 from linkcheck.plugins import viruscheck as clamav
 
 
-class TestClamav (unittest.TestCase):
+class TestClamav(unittest.TestCase):
 
     def setUp(self):
         self.clamav_conf = clamav.get_clamav_conf("/etc/clamav/clamd.conf")
diff --git a/tests/test_console.py b/tests/test_console.py
index 1d05b8a0..b5609858 100644
--- a/tests/test_console.py
+++ b/tests/test_console.py
@@ -21,7 +21,7 @@ import unittest
 import linkcheck.director.console
 
 
-class TestConsole (unittest.TestCase):
+class TestConsole(unittest.TestCase):
     """Test console operations."""
 
     def test_internal_error (self):
diff --git a/tests/test_containers.py b/tests/test_containers.py
index 476c9e5d..d3b65e80 100644
--- a/tests/test_containers.py
+++ b/tests/test_containers.py
@@ -22,7 +22,7 @@ import unittest
 import linkcheck.containers
 
 
-class TestLFUCache (unittest.TestCase):
+class TestLFUCache(unittest.TestCase):
     """Test LFU cache implementation."""
 
     def setUp (self):
diff --git a/tests/test_cookies.py b/tests/test_cookies.py
index 54301063..2853661c 100644
--- a/tests/test_cookies.py
+++ b/tests/test_cookies.py
@@ -25,7 +25,7 @@ import linkcheck.configuration
 import linkcheck.director
 
 
-class TestCookies (unittest.TestCase):
+class TestCookies(unittest.TestCase):
     """Test cookie routines."""
 
     def test_cookie_parse_multiple_headers (self):
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
index 833d4103..6436d21a 100644
--- a/tests/test_decorators.py
+++ b/tests/test_decorators.py
@@ -24,7 +24,7 @@ import unittest
 import linkcheck.decorators
 
 
-class TestDecorators (unittest.TestCase):
+class TestDecorators(unittest.TestCase):
     """
     Test decorators.
     """
diff --git a/tests/test_dummy.py b/tests/test_dummy.py
index 8b50d023..af747cbf 100644
--- a/tests/test_dummy.py
+++ b/tests/test_dummy.py
@@ -22,7 +22,7 @@ import unittest
 import linkcheck.dummy
 
 
-class TestDummy (unittest.TestCase):
+class TestDummy(unittest.TestCase):
     """
     Test dummy object.
     """
diff --git a/tests/test_filenames.py b/tests/test_filenames.py
index 866fbd0a..fe6f54f5 100644
--- a/tests/test_filenames.py
+++ b/tests/test_filenames.py
@@ -23,7 +23,7 @@ from linkcheck.checker.fileurl import get_nt_filename
 from . import need_windows
 
 
-class TestFilenames (unittest.TestCase):
+class TestFilenames(unittest.TestCase):
     """
     Test filename routines.
     """
diff --git a/tests/test_fileutil.py b/tests/test_fileutil.py
index 1a82ca6f..55846255 100644
--- a/tests/test_fileutil.py
+++ b/tests/test_fileutil.py
@@ -24,7 +24,7 @@ file_existing = __file__
 file_non_existing = "ZZZ.i_dont_exist"
 
 
-class TestFileutil (unittest.TestCase):
+class TestFileutil(unittest.TestCase):
     """Test file utility functions."""
 
     def test_size (self):
diff --git a/tests/test_ftpparse.py b/tests/test_ftpparse.py
index d307d418..f9b207f2 100644
--- a/tests/test_ftpparse.py
+++ b/tests/test_ftpparse.py
@@ -78,7 +78,7 @@ patterns = (
 )
 
 
-class TestFtpparse (unittest.TestCase):
+class TestFtpparse(unittest.TestCase):
     """
     Test FTP LIST line parsing.
     """
diff --git a/tests/test_linkchecker.py b/tests/test_linkchecker.py
index 2e55c82d..b6944c62 100644
--- a/tests/test_linkchecker.py
+++ b/tests/test_linkchecker.py
@@ -22,7 +22,7 @@ def run_with_options(options, cmd=linkchecker_cmd):
     run_checked([sys.executable, cmd] + options)
 
 
-class TestLinkchecker (unittest.TestCase):
+class TestLinkchecker(unittest.TestCase):
     """Test the linkchecker commandline client."""
 
     def test_linkchecker(self):
diff --git a/tests/test_linkparser.py b/tests/test_linkparser.py
index 142e0b09..267f0cc4 100644
--- a/tests/test_linkparser.py
+++ b/tests/test_linkparser.py
@@ -21,7 +21,7 @@ import unittest
 from linkcheck.htmlutil import htmlsoup, linkparse
 
 
-class TestLinkparser (unittest.TestCase):
+class TestLinkparser(unittest.TestCase):
     """
     Test link parsing.
     """
diff --git a/tests/test_mimeutil.py b/tests/test_mimeutil.py
index 9a4e7bed..a56f7258 100644
--- a/tests/test_mimeutil.py
+++ b/tests/test_mimeutil.py
@@ -22,7 +22,7 @@ import os
 from . import get_file
 import linkcheck.mimeutil
 
-class TestMiMeutil (unittest.TestCase):
+class TestMiMeutil(unittest.TestCase):
     """Test file utility functions."""
 
     def mime_test (self, filename, mime_expected):
diff --git a/tests/test_network.py b/tests/test_network.py
index 253fe47f..bf454248 100644
--- a/tests/test_network.py
+++ b/tests/test_network.py
@@ -22,7 +22,7 @@ from tests import need_network, need_linux
 from linkcheck.network import iputil
 
 
-class TestNetwork (unittest.TestCase):
+class TestNetwork(unittest.TestCase):
     """Test network functions."""
 
     @need_network
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 4c68b2b7..055ac6e8 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -132,7 +132,7 @@ parsetests = [
 ]
 
 
-class TestParser (unittest.TestCase):
+class TestParser(unittest.TestCase):
     """
     Test html parser.
     """
diff --git a/tests/test_po.py b/tests/test_po.py
index 05b89fb2..c2f1c7c9 100644
--- a/tests/test_po.py
+++ b/tests/test_po.py
@@ -37,7 +37,7 @@ def get_pofiles ():
     return pofiles
 
 
-class TestPo (unittest.TestCase):
+class TestPo(unittest.TestCase):
     """Test .po file syntax."""
 
     @need_posix
@@ -49,7 +49,7 @@ class TestPo (unittest.TestCase):
             self.assertEqual(ret, 0, msg="PO-file syntax error in %r" % f)
 
 
-class TestGTranslator (unittest.TestCase):
+class TestGTranslator(unittest.TestCase):
     """GTranslator displays a middot · for a space. Unfortunately, it
     gets copied with copy-and-paste, what a shame."""
 
diff --git a/tests/test_robotparser.py b/tests/test_robotparser.py
index 15d57764..20eb58c6 100644
--- a/tests/test_robotparser.py
+++ b/tests/test_robotparser.py
@@ -22,7 +22,7 @@ from tests import need_network
 from linkcheck import configuration, robotparser2
 
 
-class TestRobotParser (unittest.TestCase):
+class TestRobotParser(unittest.TestCase):
     """
     Test robots.txt parser (needs internet access).
     """
diff --git a/tests/test_robotstxt.py b/tests/test_robotstxt.py
index a3ab1265..67273f7d 100644
--- a/tests/test_robotstxt.py
+++ b/tests/test_robotstxt.py
@@ -22,7 +22,7 @@ import unittest
 import linkcheck.robotparser2
 
 
-class TestRobotsTxt (unittest.TestCase):
+class TestRobotsTxt(unittest.TestCase):
     """
     Test string formatting routines.
     """
diff --git a/tests/test_strformat.py b/tests/test_strformat.py
index 0517a671..2e8d0fc3 100644
--- a/tests/test_strformat.py
+++ b/tests/test_strformat.py
@@ -24,7 +24,7 @@ import time
 import linkcheck.strformat
 
 
-class TestStrFormat (unittest.TestCase):
+class TestStrFormat(unittest.TestCase):
     """
     Test string formatting routines.
     """
diff --git a/tests/test_updater.py b/tests/test_updater.py
index f7cb67db..5fd38aa2 100644
--- a/tests/test_updater.py
+++ b/tests/test_updater.py
@@ -23,7 +23,7 @@ from tests import need_network
 import linkcheck.updater
 
 
-class TestUpdater (unittest.TestCase):
+class TestUpdater(unittest.TestCase):
     """Test update check."""
 
     @need_network
diff --git a/tests/test_url.py b/tests/test_url.py
index b6b17844..a5f30d14 100644
--- a/tests/test_url.py
+++ b/tests/test_url.py
@@ -41,7 +41,7 @@ def url_norm (url, encoding="utf-8"):
     return linkcheck.url.url_norm(url, encoding=encoding)[0]
 
 
-class TestUrl (unittest.TestCase):
+class TestUrl(unittest.TestCase):
     """Test url norming and quoting."""
 
     def urlnormtest (self, url, nurl, encoding=None):
diff --git a/tests/test_urlbuild.py b/tests/test_urlbuild.py
index d98f3ca1..26babf9c 100644
--- a/tests/test_urlbuild.py
+++ b/tests/test_urlbuild.py
@@ -33,7 +33,7 @@ def get_test_aggregate ():
     return linkcheck.director.get_aggregate(config)
 
 
-class TestUrlBuild (unittest.TestCase):
+class TestUrlBuild(unittest.TestCase):
     """
     Test url building.
     """