diff --git a/.travis.yml b/.travis.yml
index 1db049d8..ebe63f3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,8 @@ script:
     - "echo 'backend : Agg' > $HOME/.matplotlib/matplotlibrc"
     - "echo 'backend.qt4 : PyQt4' >> $HOME/.matplotlib/matplotlibrc"
     # Run all tests
-    - nosetests --exe -v --with-doctest --ignore-files='^\.' --ignore-files='^setup\.py$$' --ignore-files='^_test' skimage
+    - python -c "import skimage; skimage.test_verbose()"
+    - python -c "import skimage; skimage.doctest_verbose()"
     # Run all doc examples
     - export PYTHONPATH=$(pwd):$PYTHONPATH
     - for f in doc/examples/*.py; do $PYTHON "$f"; if [ $? -ne 0 ]; then exit 1; fi done
diff --git a/Makefile b/Makefile
index e1a35e58..13f82103 100644
--- a/Makefile
+++ b/Makefile
@@ -7,15 +7,10 @@ clean:
 	find . -name "*.so" -o -name "*.pyc" -o -name "*.pyx.md5" | xargs rm -f
 
 test:
-	nosetests skimage
+	python -c "import skimage; skimage.test_verbose()"
 
 doctest:
-	nosetests \
-		--with-doctest \
-		--ignore-files="^\." \
-		--ignore-files="^setup\.py$$" \
-		--ignore-files="^_test"
-		skimage
+	python -c "import skimage; skimage.doctest_verbose()"
 
 coverage:
 	nosetests skimage --with-coverage --cover-package=skimage