diff --git a/.travis.yml b/.travis.yml
index c3a78ca..c7de9db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ before_script:
   - git config --global user.name "pbrod"
 script:
    - coverage run --source=wafo setup.py test
-   - py.test wafo --cov --pep8 --doctest-modules
+#   - py.test wafo --cov --pep8 --doctest-modules
 after_success:
   - coveralls
   - codecov
diff --git a/setup.cfg b/setup.cfg
index 28affed..4def869 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,9 +63,10 @@ doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
 # e.g. --cov-report html (or xml) for html/xml output or --junitxml junit.xml
 # in order to write a coverage file that can be read by Jenkins.
 addopts =
-    --cov wafo --cov-report term-missing
-    --verbose
+#    --cov wafo --cov-report term-missing
+#    --verbose
     --doctest-modules
+    --pep8
 
 norecursedirs =
     .*