diff --git a/setup.py b/setup.py
index d6e3bf9..377d215 100644
--- a/setup.py
+++ b/setup.py
@@ -21,8 +21,8 @@ tests_require = [
     'coverage==4.1.b2',
     'hypothesis==2.0.0',
     'hypothesis-pytest==0.19.0',
-    'pep257==0.7.0',
     'py==1.4.31',
+    'pydocstyle==1.0.0',
     'pytest==2.8.7',
     'pytest-cov==2.2.1'
 ]
diff --git a/test.sh b/test.sh
index c2763a1..7d2eda5 100755
--- a/test.sh
+++ b/test.sh
@@ -12,5 +12,5 @@ COV="--cov=bidict"
 # Don't pass --cov in these cases:
 [[ $TRAVIS_PYTHON_VERSION =~ ^(3\.3|3\.4|pypy)$ ]] && COV=""
 py.test $COV || FAILED=1
-pep257 bidict || FAILED=1
+pydocstyle bidict || FAILED=1
 exit $FAILED