diff --git a/HISTORY.rst b/HISTORY.rst
index 86fc00b..506580f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,6 +6,16 @@ History
 
 .. towncrier release notes start
 
+2.2.2 (2020-05-15)
+=======================
+
+Bugfixes
+--------
+
+- Fix pytest args splitting (#155)
+- Fix runserver autoreload with channels 2.4 (#157)
+
+
 2.2.1 (2020-04-23)
 ==================
 
diff --git a/app_helper/__init__.py b/app_helper/__init__.py
index 1ab53ec..493687b 100644
--- a/app_helper/__init__.py
+++ b/app_helper/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
-__version__ = "2.2.1"
+__version__ = "2.2.2"
 __author__ = "Iacopo Spalletti <i.spalletti@nephila.it>"
 __all__ = ["runner"]
 
diff --git a/app_helper/main.py b/app_helper/main.py
index 09fe0b5..eaf0528 100644
--- a/app_helper/main.py
+++ b/app_helper/main.py
@@ -218,10 +218,9 @@ def static_analisys(application):
 
 def server(bind="127.0.0.1", port=8000, migrate_cmd=False, verbose=1):  # pragma: no cover
     try:
-        from channels.log import setup_logger
         from channels.management.commands import runserver
 
-        logger = setup_logger("django.channels", 1)
+        logger = None
         use_channels = True
     except ImportError:
         from django.contrib.staticfiles.management.commands import runserver
diff --git a/app_helper/pytest_runner.py b/app_helper/pytest_runner.py
index 039d601..01da2a3 100644
--- a/app_helper/pytest_runner.py
+++ b/app_helper/pytest_runner.py
@@ -2,6 +2,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import os
+import shlex
 
 
 class PytestTestRunner(object):
@@ -19,7 +20,7 @@ def run_tests(self, test_labels):
         """
         import pytest
 
-        argv = os.environ.get("PYTEST_ARGS", "").split(" ")
+        argv = shlex.split(os.environ.get("PYTEST_ARGS", ""))
         if self.verbosity == 0:
             argv.append("--quiet")
         if self.verbosity == 2:
diff --git a/setup.cfg b/setup.cfg
index 549d5d1..b4a9de7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
-current_version = 2.2.1
+current_version = 2.2.2
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.?)(?P<release>[a-z]*)(?P<relver>\d*)
-serialize = 
+serialize =
 	{major}.{minor}.{patch}.{release}{relver}
 	{major}.{minor}.{patch}
 commit = True
@@ -12,7 +12,7 @@ message = Release {new_version}
 
 [bumpversion:part:release]
 optional_value = gamma
-values = 
+values =
 	dev
 	a
 	b
@@ -25,7 +25,7 @@ values =
 name = django-app-helper
 version = attr: app_helper.__version__
 url = https://github.com/nephila/django-app-helper
-project_urls = 
+project_urls =
 	Documentation = https://django-app-helper.readthedocs.io/
 author = Iacopo Spalletti
 author_email = i.spalletti@nephila.it
@@ -34,7 +34,7 @@ long_description = file: README.rst, HISTORY.rst
 long_description_content_type = text/x-rst
 license = GPLv2+
 license_file = LICENSE
-classifiers = 
+classifiers =
 	License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 	Development Status :: 5 - Production/Stable
 	Framework :: Django
@@ -52,12 +52,12 @@ classifiers =
 
 [options]
 include_package_data = True
-install_requires = 
+install_requires =
 	dj-database-url
 	docopt
 	mock;python_version<"3.3"
 	six
-setup_requires = 
+setup_requires =
 	setuptools
 packages = find:
 python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
@@ -69,7 +69,7 @@ zip_safe = False
 app_helper = *.html *.png *.gif *js *jpg *jpeg *svg *py *mo *po
 
 [options.entry_points]
-console_scripts = 
+console_scripts =
 	django-app-helper = app_helper.main:main
 
 [options.extras_require]
diff --git a/tasks.py b/tasks.py
index aac8028..380c823 100644
--- a/tasks.py
+++ b/tasks.py
@@ -60,7 +60,7 @@ def tag_dev(c):
 def docbuild(c):
     """ Build documentation. """
     os.chdir("docs")
-    c.run(f"python -msphinx -W -b html -d _build/doctrees . _build/html")
+    c.run("python -msphinx -W -b html -d _build/doctrees . _build/html")
 
 
 @task(docbuild)
diff --git a/tox.ini b/tox.ini
index b9c9c76..d13f39e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -158,13 +158,13 @@ use_parentheses = True
 
 [check-manifest]
 ignore =
-    .[a-z]*
+    .*
     *.ini
     *.toml
     *.txt
     *.yml
     app_helper/test_utils/AUTHORS
-    app_helper/test_utils/example1/locale*
-    changes*
-    docs*
+    app_helper/test_utils/example1/locale/**
+    changes/**
+    docs/**
     tasks.py