@@ -111,8 +111,9 @@ def dummy_task(x, y):
         assert stack_lengths == [2, 2]
 
 
-@pytest.mark.skipif(
-    (4, 2, 0) <= VERSION < (4, 2, 3),
+@pytest.mark.xfail(
+    (4, 2, 0) <= VERSION,
+    strict=True,
     reason="https://github.com/celery/celery/issues/4661",
 )
 def test_retry(celery, capture_events):
 
@@ -5,54 +5,61 @@
 
 [tox]
 envlist =
-    # core
+    # === Core ===
     py{2.7,3.4,3.5,3.6,3.7,3.8}
     pypy
 
-    # integrations
-    {py3.7,py3.8}-django-dev
+
+    # === Integrations ===
+    # Formatting: 1 blank line between different integrations.
+
+    py3.7-django-{2.2,dev}
     {py3.5,py3.6,py3.7}-django-{2.0,2.1}
     {pypy,py2.7,py3.5}-django-1.11
     {pypy,py2.7,py3.4,py3.5}-django-{1.8,1.9,1.10}
     {pypy,py2.7,py3.4}-django-1.7
     {pypy,py2.7}-django-1.6
 
     {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-flask-{1.0,0.11,0.12,dev}
+
     {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-bottle-0.12
 
     {py3.5,py3.6,py3.7}-sanic-{0.8,18,19}
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2}
+    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2,4.3}
     {pypy,py2.7}-celery-3
 
-    {py2.7,py3.7}-requests
-
+    # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
     py3.7-aws_lambda
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-pyramid-{1.3,1.4,1.5,1.6,1.7,1.8,1.9}
+    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-pyramid-{1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10}
 
     {pypy,py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-rq-{0.12,0.13}
+    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-rq-{0.12,0.13,1.0}
+
+    py3.7-aiohttp-{3.5,3.6}
 
-    py3.7-aiohttp
     {py3.7,py3.8}-tornado-{5,6}
 
+    {py2.7,py3.7}-requests
+
 [testenv]
 deps =
     -r test-requirements.txt
 
-    django-{1.11,2.0,2.1}: djangorestframework>=3.0.0,<4.0.0
+    django-{1.11,2.0,2.1,2.2}: djangorestframework>=3.0.0,<4.0.0
 
     django-{1.6,1.7,1.8}: pytest-django<3.0
-    django-{1.9,1.10,1.11,2.0,2.1,dev}: pytest-django>=3.0
+    django-{1.9,1.10,1.11,2.0,2.1,2.2,dev}: pytest-django>=3.0
     django-1.6: Django>=1.6,<1.7
     django-1.7: Django>=1.7,<1.8
     django-1.8: Django>=1.8,<1.9
     django-1.9: Django>=1.9,<1.10
     django-1.10: Django>=1.10,<1.11
     django-1.11: Django>=1.11,<1.12
     django-2.0: Django>=2.0,<2.1
-    django-2.1: Django>=2.0,<2.1
+    django-2.1: Django>=2.1,<2.2
+    django-2.2: Django>=2.2,<2.3
     django-dev: git+https://github.com/django/django.git#egg=Django
 
     flask: flask-login
@@ -62,6 +69,7 @@ deps =
     flask-dev: git+https://github.com/pallets/flask.git#egg=flask
 
     bottle-0.12: bottle>=0.12,<0.13
+    bottle-dev: git+https://github.com/bottlepy/bottle#egg=bottle
 
     sanic-0.8: sanic>=0.8,<0.9
     sanic-18: sanic>=18.0,<19.0
@@ -72,6 +80,7 @@ deps =
     celery-3: Celery>=3.1,<4.0
     celery-4.1: Celery>=4.1,<4.2
     celery-4.2: Celery>=4.2,<4.3
+    celery-4.3: Celery>=4.3,<4.4
 
     requests: requests>=2.0
 
@@ -84,9 +93,10 @@ deps =
     pyramid-1.7: pyramid>=1.7,<1.8
     pyramid-1.8: pyramid>=1.8,<1.9
     pyramid-1.9: pyramid>=1.9,<1.10
+    pyramid-1.10: pyramid>=1.10,<1.11
 
     rq-{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: fakeredis<1.0
-    rq-0.13: fakeredis>=1.0
+    rq-{0.13,1.0}: fakeredis>=1.0
     # fakeredis 1.0 is broken with redis 3.2
     rq: redis<3.2.0
 
@@ -98,8 +108,10 @@ deps =
     rq-0.11: rq>=0.11,<0.12
     rq-0.12: rq>=0.12,<0.13
     rq-0.13: rq>=0.13,<0.14
+    rq-1.0: rq>=1.0,<1.1
 
-    aiohttp: aiohttp>=3.4.0,<3.5.0
+    aiohttp-3.4: aiohttp>=3.4.0,<3.5.0
+    aiohttp-3.5: aiohttp>=3.5.0,<3.6.0
     aiohttp: pytest-aiohttp
 
     tornado-5: tornado>=5,<6