diff --git a/.travis.yml b/.travis.yml
index 48a482e1..832d2cd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,14 @@ python:
     - "3.5"
     - "3.6"
     - "3.7"
+    - "3.7-dev"
+    - "3.8-dev"
 
 allow_failure:
-    - python: "3.7"
+    - python: "3.8-dev"
 
 install:
     - pip install -r requirements.txt
-    - pip install -r requirements-dev.txt
 
 before_script:
     - make prepare
@@ -30,7 +31,7 @@ deploy:
     provider: script
     script: make upload-pypi
     on:
-        python: 3.6
+        python: 3.7
         tags: true
 
 notifications:
diff --git a/requirements.txt b/requirements.txt
index 5ecf3981..99ed2ef7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,10 @@
+async-generator==1.10; python_version>="3.6"
 codacy-coverage==1.3.11
 mock==2.0.0
 pytest-cov==2.6.1
+pytest-tornasync; python_version >= '3.5'
+pytest-trio==0.5.2; python_version>="3.6"
 pytest==4.4.1
 six==1.12.0
+tornado>=5.0
 trio==0.11.0; python_version>="3.6"
-pytest-trio==0.5.2; python_version>="3.6"
-async-generator==1.10; python_version>="3.6"
diff --git a/setup.py b/setup.py
index 6315914f..e9d5894c 100644
--- a/setup.py
+++ b/setup.py
@@ -69,10 +69,10 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     packages=[
         'rethinkdb',