diff --git a/.travis.yml b/.travis.yml
index 38e80eb..7c3d554 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ install:
 before_script:
   - "mkdir ~/.elodie"
   - "sed 's/your-api-key-goes-here/x8wQLqGhW7qK3sFpjYtVTogVtoMK0S8s/g' config.ini-sample > ~/.elodie/config.ini"
-script: "nosetests elodie/tests/*.py"
+script: "nosetests -w elodie/tests"
diff --git a/elodie/tests/__init__.py b/elodie/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/elodie/tests/filesystem.py b/elodie/tests/filesystem_test.py
similarity index 100%
rename from elodie/tests/filesystem.py
rename to elodie/tests/filesystem_test.py
diff --git a/elodie/tests/media/__init__.py b/elodie/tests/media/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/elodie/tests/media/media.py b/elodie/tests/media/media_test.py
similarity index 100%
rename from elodie/tests/media/media.py
rename to elodie/tests/media/media_test.py
diff --git a/elodie/tests/media/photo.py b/elodie/tests/media/photo_test.py
similarity index 100%
rename from elodie/tests/media/photo.py
rename to elodie/tests/media/photo_test.py