diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ad4fa0b0bf..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,57 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-include
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-#Mac
-*.DS_Store
-
-# IPython Notebook Checkpoints
-.ipynb_checkpoints
-
-#Virtualenv
-ENV
-.env
-
-# Tests products
-.cache
-data.png
-map.html
-
-# example outputs
-examples/*.html
-
-# documentation builds
-docs/_build
diff --git a/.travis.yml b/.travis.yml
index 9c64dc3c61..e8eea07971 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,24 @@ language: python
 
 sudo: false
 
-python:
-    - 2.7
-    - 3.4
-    - 3.5
-
-env:
-    - TEST_TARGET=branca_release
-    - TEST_TARGET=branca_latest
-    - TEST_TARGET=coding_standards
+matrix:
+  fast_finish: true
+  include:
+  - python: 2.7
+    env: TEST_TARGET=branca_release
+  - python: 3.5
+    env: TEST_TARGET=branca_release
+  - python: 3.5
+    env: TEST_TARGET=coding_standards
+  - python: 3.5
+    env: TEST_TARGET=notebooks
+  - python: 2.7
+    env: TEST_TARGET=branca_latest
+  - python: 3.5
+    env: TEST_TARGET=branca_latest
+  allow_failures:
+  - python: 3.5
+    env: TEST_TARGET=branca_latest
 
 before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
@@ -31,7 +40,7 @@ install:
 
 script:
     - if [[ $TEST_TARGET == 'branca_release' ]]; then
-        python setup.py test ;
+        py.test -vv --ignore=tests/notebooks/test_notebooks.py ;
       fi
 
     - if [[ $TEST_TARGET == 'branca_latest' ]]; then
@@ -42,3 +51,7 @@ script:
     - if [[ $TEST_TARGET == 'coding_standards' ]]; then
         find . -type f -name "*.py" ! -name 'conf.py' | xargs flake8 --max-line-length=100 ;
       fi
+
+    - if [[ $TEST_TARGET == 'notebooks' ]]; then
+        py.test -vv tests/notebooks/test_notebooks.py ;
+      fi
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index 586c3a61ed..0000000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tests products
-data.png
-map.html
diff --git a/tests/test_notebooks.py b/tests/notebooks/test_notebooks.py
similarity index 95%
rename from tests/test_notebooks.py
rename to tests/notebooks/test_notebooks.py
index cf8664e8da..b91348eda9 100644
--- a/tests/test_notebooks.py
+++ b/tests/notebooks/test_notebooks.py
@@ -32,7 +32,7 @@ def __call__(self, exporter=None, filename=None):
                 open(filename, 'w').write(out_nb[0].encode('utf-8'))
 
     class TestNotebooks(object):
-        _filepath = rootpath.rstrip('/')+'/../examples/'
+        _filepath = rootpath.rstrip('/') + '/../../examples/'
         _nblist = [x for x in os.listdir(_filepath) if x.endswith('.ipynb')]
 
     for fn in TestNotebooks._nblist:
diff --git a/tests/plugins/__init__.py b/tests/plugins/__init__.py
deleted file mode 100644
index c01da1bdfc..0000000000
--- a/tests/plugins/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Plugins tests
--------------
-
-Create at least one test per plugin.
-"""