diff --git a/.travis.yml b/.travis.yml
index b095706..5317be4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
   - "pypy"
 install:
   - "pip install -U setuptools pip"
diff --git a/docs/requirements-dev.txt b/docs/requirements-dev.txt
deleted file mode 100644
index 9acfcd2..0000000
--- a/docs/requirements-dev.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-backports.ssl-match-hostname==3.4.0.2
-docker-py==0.7.1
-Flask==0.10.1
-itsdangerous==0.24
-requests==2.4.3
-six==1.9.0
-websocket-client==0.23.0
-Werkzeug==0.10
diff --git a/docs/requirements.in b/docs/requirements.in
new file mode 100644
index 0000000..80806ad
--- /dev/null
+++ b/docs/requirements.in
@@ -0,0 +1,4 @@
+sphinx
+sphinx-kr-theme
+
+jinja2>=2.8.1  # CVE-2016-10745 and CVE-2019-10906
diff --git a/docs/requirements.txt b/docs/requirements.txt
index d48bc42..b7b8198 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,6 +1,12 @@
-docutils==0.12
-Jinja2==2.7.3
-MarkupSafe==0.23
-Pygments==2.0.2
-Sphinx==1.2.3
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements.in
+#
+docutils==0.12            # via sphinx
+jinja2==2.10.1
+markupsafe==0.23          # via jinja2
+pygments==2.0.2           # via sphinx
 sphinx-kr-theme==0.2.1
+sphinx==1.2.3
diff --git a/setup.cfg b/setup.cfg
index df75c2a..5577963 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,7 @@
-[pytest]
-addopts = --pep8 --cov flask_docker.py
-pep8ignore =
-    docs/conf.py ALL
 [bdist_wheel]
 universal = 1
+
+[tool:pytest]
+addopts = --pep8 --cov flask_docker
+pep8ignore =
+    docs/conf.py ALL
diff --git a/tests/__init__.py b/tests/conftest.py
similarity index 100%
rename from tests/__init__.py
rename to tests/conftest.py
diff --git a/tests/test_factory.py b/tests/test_factory.py
index 30f22f2..02a07b1 100644
--- a/tests/test_factory.py
+++ b/tests/test_factory.py
@@ -32,11 +32,11 @@ def test_out_of_context():
     # but if we...
     with raises(RuntimeError) as error:
         docker.app.name
-    assert error.value.args[0] == 'working outside of application context'
+    assert 'outside of application context' in error.value.args[0]
 
     with raises(RuntimeError) as error:
         docker.client
-    assert error.value.args[0] == 'working outside of application context'
+    assert 'outside of application context' in error.value.args[0]
 
 
 def test_url_missing(app):
diff --git a/tox.ini b/tox.ini
index 44b8b48..eeff26f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,11 @@
 [tox]
-envlist = py27,py33,py34,pypy,docs
+envlist = py27,py34,py35,py36,py37,pypy,docs
+
 [testenv]
+# Fit for the bad design of Python 3.x
+setenv =
+    LC_ALL=C.UTF-8
+    LANG=C.UTF-8
 deps =
     setuptools>=12.0
     pytest
@@ -10,6 +15,7 @@ deps =
     responses
 commands =
     py.test
+
 [testenv:docs]
 changedir = docs
 deps =