diff --git a/.travis.yml b/.travis.yml
index 1fc8c2c..b54c130 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ python:
     - "3.4"
     - "3.5"
     - "3.6"
-    - "nightly"
+    - "3.7-dev"
     - "pypy"
-    - "pypy3.3-5.2-alpha1"
+    - "pypy3.5"
 install:
     - pip install ansicolors
     - pip install textwrap3
diff --git a/CHANGES.yml b/CHANGES.yml
index fe782fc..8454bf0 100644
--- a/CHANGES.yml
+++ b/CHANGES.yml
@@ -1,3 +1,9 @@
+-
+  version: 0.8.4
+  date: January 23, 2019
+  notes: >
+    Updated testing matrix.
+
 -
   version: 0.8.3
   date: June 14, 2017
diff --git a/README.rst b/README.rst
index a4c390e..e2bf89d 100644
--- a/README.rst
+++ b/README.rst
@@ -55,7 +55,7 @@ functions of ``textwrap``. For example::
 It also exports several other functions:
 
 * ``ansilen`` (giving the effective length of a string, ignoring ANSI control codes)
-* ``ansi_terminate_lines`` (propogates control codes though a list of strings/lines
+* ``ansi_terminate_lines`` (propagates control codes though a list of strings/lines
   and terminates each line.)
 * ``strip_color`` (removes ANSI control codes from a string)
 
diff --git a/ansiwrap/__init__.py b/ansiwrap/__init__.py
index 4099a58..7d8159b 100644
--- a/ansiwrap/__init__.py
+++ b/ansiwrap/__init__.py
@@ -1,4 +1,4 @@
 from .core import *
 
-__version__ = '0.8.3'
+__version__ = '0.8.4'
 
diff --git a/setup.py b/setup.py
index 9c7b36a..184ad00 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ def lines(text):
 
 setup(
     name='ansiwrap',
-    version='0.8.3',
+    version='0.8.4',
     author='Jonathan Eunice',
     author_email='jonathan.eunice@gmail.com',
     description="textwrap, but savvy to ANSI colors and styles",
@@ -23,7 +23,7 @@ def lines(text):
     license='Apache License 2.0',
     packages=['ansiwrap'],
     setup_requires=[],
-    install_requires=['textwrap3'],
+    install_requires=['textwrap3>=0.9.2'],
     tests_require=['tox', 'pytest', 'ansicolors>=1.1.8', 'coverage', 'pytest-cov'],
     test_suite="test",
     zip_safe=False,
@@ -43,6 +43,7 @@ def lines(text):
         Programming Language :: Python :: 3.4
         Programming Language :: Python :: 3.5
         Programming Language :: Python :: 3.6
+        Programming Language :: Python :: 3.7
         Programming Language :: Python :: Implementation :: CPython
         Programming Language :: Python :: Implementation :: PyPy
         Topic :: Software Development :: Libraries :: Python Modules
diff --git a/tox.ini b/tox.ini
index 2c07614..46f4dc5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py2{6,7}, pypy, py3{3,4,5,6}, pypy3
+envlist = py27, py3{6,7}
 
 [testenv]
 # changedir=test
diff --git a/toxcov.ini b/toxcov.ini
index 81be4cc..9eecdaf 100644
--- a/toxcov.ini
+++ b/toxcov.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = cov-init, py2{6,7}, pypy, py3{3,4,5,6}, pypy3, cov-report
+envlist = cov-init, py27, py3{6,7}, cov-report
 
 [testenv:cov-init]
 setenv =