diff --git a/.travis.yml b/.travis.yml
index 77262c74..48c83880 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,10 @@ sudo: false
 language: python
 matrix:
   include:
-    - python: 3.6
+    - python: 3.7
       env: TOXENV=lint
+      dist: xenial
+      sudo: true
     - python: 3.4
       env: TOXENV=py34
     - python: 3.5
diff --git a/requirements_test.txt b/requirements_test.txt
index 424c4ac1..d50e1d9e 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,3 +1,4 @@
+aiohttp
 coverage>=4.0,<4.4  # TODO: https://github.com/benoitc/gunicorn/issues/1548
 pytest
 pytest-cov==2.5.1
diff --git a/tox.ini b/tox.ini
index 5a44b7f4..cd694555 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34, py35, py36, py36-dev, py37, pypy, lint
+envlist = py34, py35, py36, py37, py38-dev, pypy, lint
 skipsdist = True
 
 [testenv]
@@ -7,7 +7,6 @@ usedevelop = True
 commands = py.test {posargs}
 deps =
   -rrequirements_test.txt
-  py{34,35,36,36-dev,37}: aiohttp
 
 [testenv:lint]
 commands =