diff --git a/pytest.ini b/pytest.ini
index 4f933dae..da3dfa52 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,3 @@
 [pytest]
-addopts = --flake8 --isort --cov radicale radicale
+addopts = --flake8 --isort --cov radicale/ tests
 norecursedirs = dist .cache .git build *.egg-info .eggs venv
diff --git a/radicale/__main__.py b/radicale/__main__.py
index cda628b5..139306ce 100644
--- a/radicale/__main__.py
+++ b/radicale/__main__.py
@@ -23,18 +23,17 @@ from a python programme with ``radicale.__main__.run()``.
 """
 
 import atexit
-import os
-import sys
 import optparse
+import os
 import select
 import signal
 import socket
 import ssl
+import sys
 from wsgiref.simple_server import make_server
 
-from . import (
-    Application, config, ThreadedHTTPServer, ThreadedHTTPSServer, log,
-    RequestHandler, VERSION)
+from . import (VERSION, Application, RequestHandler, ThreadedHTTPServer,
+               ThreadedHTTPSServer, config, log)
 
 
 # This is a script, many branches and variables
diff --git a/radicale/auth.py b/radicale/auth.py
index 00f3eb4e..af3117f1 100644
--- a/radicale/auth.py
+++ b/radicale/auth.py
@@ -53,8 +53,8 @@ following significantly more secure schemes are parsable by Radicale:
 
 """
 
-import functools
 import base64
+import functools
 import hashlib
 import os
 from importlib import import_module
diff --git a/radicale/config.py b/radicale/config.py
index eae9116f..83c00e46 100644
--- a/radicale/config.py
+++ b/radicale/config.py
@@ -24,10 +24,8 @@ Give a configparser-like interface to read and write configuration.
 """
 
 import os
-
 from configparser import RawConfigParser as ConfigParser
 
-
 # Default configuration
 INITIAL_CONFIG = {
     "server": {
diff --git a/radicale/log.py b/radicale/log.py
index aa5c4641..6523593f 100644
--- a/radicale/log.py
+++ b/radicale/log.py
@@ -22,11 +22,11 @@ http://docs.python.org/library/logging.config.html
 
 """
 
-import os
-import sys
 import logging
 import logging.config
+import os
 import signal
+import sys
 
 
 def configure_from_file(filename, debug, logger):
diff --git a/radicale/rights.py b/radicale/rights.py
index 08381f25..e4d780a2 100644
--- a/radicale/rights.py
+++ b/radicale/rights.py
@@ -40,8 +40,8 @@ Leading or ending slashes are trimmed from collection's path.
 import os.path
 import re
 from configparser import ConfigParser
-from io import StringIO
 from importlib import import_module
+from io import StringIO
 
 
 def load(configuration, logger):
diff --git a/radicale/xmlutils.py b/radicale/xmlutils.py
index 7e882996..696ce573 100644
--- a/radicale/xmlutils.py
+++ b/radicale/xmlutils.py
@@ -36,7 +36,6 @@ import vobject
 
 from . import client, storage
 
-
 NAMESPACES = {
     "C": "urn:ietf:params:xml:ns:caldav",
     "CR": "urn:ietf:params:xml:ns:carddav",