diff --git a/.travis.yml b/.travis.yml
index 3bbaffdc..7458db1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
   - TOXENV=coveralls
   - TOXENV=pylint
   - TOXENV=flake8
-  - TOXENV=pep257
+  - TOXENV=pydocstyle
   - TOXENV=py26
   - TOXENV=py27
   - TOXENV=py33
diff --git a/tox.ini b/tox.ini
index bd6cb072..2b8649a7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    coveralls, pylint, flake8, pep257, py26, py27, py33, py34, py35, pypy, pypy3
+    coveralls, pylint, flake8, pydocstyle, py26, py27, py33, py34, py35, pypy, pypy3
 
 [testenv]
 deps=
@@ -14,7 +14,7 @@ deps=
     {[testenv]deps}
     coverage
     flake8
-    pep257
+    pydocstyle
 commands=
     coverage erase
     coverage run --rcfile=./.coveragerc -m unittest2 discover tests []
@@ -23,8 +23,8 @@ commands=
     flake8 --max-complexity=10 dependency_injector/
     flake8 --max-complexity=10 examples/
 
-    pep257 dependency_injector/
-    pep257 examples/
+    pydocstyle dependency_injector/
+    pydocstyle examples/
 
 [testenv:coveralls]
 basepython=python2.7
@@ -53,10 +53,10 @@ commands=
     flake8 --max-complexity=10 dependency_injector/
     flake8 --max-complexity=10 examples/
 
-[testenv:pep257]
+[testenv:pydocstyle]
 basepython=python2.7
 deps=
-    pep257
+    pydocstyle
 commands=
-    pep257 dependency_injector/
-    pep257 examples/
+    pydocstyle dependency_injector/
+    pydocstyle examples/