diff --git a/.travis.yml b/.travis.yml
index 51d0357..46ed04c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,30 @@ env:
   global:
     PYTHONUNBUFFERED=yes
   matrix:
-    - TOXENV=2.7
-    - TOXENV=3.4
-    - TOXENV=pypy
-    - TOXENV=3.5
-    - TOXENV=pypy3
+    - TOXENV=2.7-django1.10
+    - TOXENV=2.7-django1.9
+    - TOXENV=pypy-django1.10
+    - TOXENV=pypy-django1.9
+    - TOXENV=3.4-django1.10
+    - TOXENV=3.4-django1.9
+    - TOXENV=3.5-django1.10
+    - TOXENV=3.5-django1.9
     - TOXENV=flake8
     - TOXENV=flakeplus
     - TOXENV=apicheck
+before_install:
+    - |
+          if [ "$TOXENV" = "pypy" ]; then
+            export PYENV_ROOT="$HOME/.pyenv"
+            if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
+              cd "$PYENV_ROOT" && git pull
+            else
+              rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
+            fi
+            "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
+            virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
+            source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
+          fi
 install: travis_retry pip install -U tox
 script: tox -v -- -v
 after_success:
diff --git a/MANIFEST.in b/MANIFEST.in
index 5d7e078..cd9fc47 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,13 +1,16 @@
+include AUTHORS
 include Changelog
 include LICENSE
 include README.rst
 include MANIFEST.in
 include setup.cfg
 include setup.py
+include tox.ini
 recursive-include docs *
 recursive-include extra/*
 recursive-include examples *
 recursive-include requirements *.txt *.rst
+recursive-include test_proj *
 
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
diff --git a/deux/__init__.py b/deux/__init__.py
index 0796f49..19e8995 100644
--- a/deux/__init__.py
+++ b/deux/__init__.py
@@ -16,6 +16,7 @@
 
 __version__ = '{0.major}.{0.minor}.{0.micro}{0.releaselevel}'.format(VERSION)
 __author__ = 'Robinhood Markets'
+__contact__ = 'opensource@robinhood.com'
 __homepage__ = 'https://github.com/robinhood/deux'
 __docformat__ = 'restructuredtext'
 
diff --git a/requirements/default.txt b/requirements/default.txt
index b0279c7..cb1885a 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -1,8 +1,8 @@
 djangorestframework>=2.4.3
-django-oauth-toolkit==0.10.0
-django-otp==0.3.5
-httplib2==0.9.2
-oauthlib==1.0.3
-pytz==2016.4
-six==1.10.0
-twilio==5.4.0
+django-oauth-toolkit>=0.10.0
+django-otp>=0.3.5
+httplib2>=0.9.2
+oauthlib>=1.0.3
+pytz>dev
+six>=1.10.0
+twilio>=5.4.0
diff --git a/requirements/django.txt b/requirements/django.txt
new file mode 100644
index 0000000..d3e4ba5
--- /dev/null
+++ b/requirements/django.txt
@@ -0,0 +1 @@
+django
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 18a86ae..98ff54e 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -1 +1,2 @@
 sphinx_celery>=1.1
+-r django.txt
diff --git a/setup.py b/setup.py
index 90a2e40..03dbdf3 100644
--- a/setup.py
+++ b/setup.py
@@ -46,6 +46,9 @@ def _pyimp():
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
     Programming Language :: Python :: Implementation :: Jython
+    Framework :: Django
+    Framework :: Django :: 1.9
+    Framework :: Django :: 1.10
     Operating System :: OS Independent
 """
 classifiers = [s.strip() for s in classes.split('\n') if s]
@@ -158,6 +161,7 @@ def finalize_options(self):
     version=meta['VERSION'],
     description=meta['doc'],
     author=meta['author'],
+    author_email=meta['contact'],
     url=meta['homepage'],
     platforms=['any'],
     license='BSD',