diff --git a/.travis.yml b/.travis.yml
index b5f8b239..b6c8d5fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,9 @@ jobs:
       script: tox
       env: TOXENV=py35,codecov
       python: 3.5
+    - script: tox
+      env: TOXENV=py35,codecov
+      python: 3.5-dev
     - script: tox
       env: TOXENV=py35-ujson,codecov
       python: 3.5
@@ -35,6 +38,9 @@ jobs:
     - script: tox
       env: TOXENV=py36,codecov
       python: 3.6
+    - script: tox
+      env: TOXENV=py36,codecov
+      python: 3.6-dev
     - script: tox
       env: TOXENV=py36-ujson,codecov
       python: 3.6
@@ -45,6 +51,27 @@ jobs:
       env: TOXENV=py36-deps-devel,codecov
       python: 3.6
 
+    - script: tox
+      env: TOXENV=py37,codecov
+      python: 3.7
+      dist: xenial
+      sudo: true
+    - script: tox
+      env: TOXENV=py37-ujson,codecov
+      python: 3.7
+      dist: xenial
+      sudo: true
+    - script: tox
+      env: TOXENV=py37-deps-lowest,codecov
+      python: 3.7
+      dist: xenial
+      sudo: true
+    - script: tox
+      env: TOXENV=py37-deps-devel,codecov
+      python: 3.7
+      dist: xenial
+      sudo: true
+
     - stage: deploy
       script: skip
       python: 3.6
diff --git a/Makefile b/Makefile
index 447a7d7d..1d399405 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,5 @@ _release:
 
 release: test _release
 
-freeze:
-	pipenv lock -d
-
 changelog:
 	gitchangelog
diff --git a/setup.py b/setup.py
index 350deee8..045971e5 100644
--- a/setup.py
+++ b/setup.py
@@ -30,12 +30,14 @@
         'Programming Language :: Python',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Framework :: AsyncIO',
     ],
     packages=find_packages(),
     install_requires=None,
     extras_require={
-        'redis': ['aioredis>=0.3.3'],
+        'redis:python_version<"3.7"': ['aioredis>=0.3.3'],
+        'redis:python_version>="3.7"': ['aioredis>=1.0.0'],
         'memcached': ['aiomcache>=0.5.2'],
         'msgpack': ['msgpack'],
     }
diff --git a/tox.ini b/tox.ini
index a7cbeec8..bd5e5bf9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-  py{36}-{deps-lowest,deps-devel}
-  py{35,36}-ujson
+  py{36,37}-{deps-lowest,deps-devel}
+  py{35,36,37}-ujson
   codecov
   syntax
   docs-html
@@ -14,7 +14,8 @@ whitelist_externals =
   bash
 
 deps =
-  deps-lowest: aioredis==0.3.3
+  py37-deps-lowest: aioredis==1.0.0
+  py36-deps-lowest: aioredis==0.3.3
   deps-lowest: aiomcache==0.5.2
   deps-devel: https://github.com/aio-libs/aiomcache/archive/master.tar.gz
   deps-devel: https://github.com/aio-libs/aioredis/archive/master.tar.gz
@@ -26,7 +27,7 @@ deps =
   .[msgpack]
 
 commands =
-  pip install pipenv
+  pip install pipenv==2018.5.18
   make install-dev
   pipenv graph
   make unit cov-report=false