4 files changed, 21 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 27a1377..6bd8527 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 test: import-cldr
-	@py.test tests
+	@py.test
 
 clean: clean-cldr clean-pyc
 
diff --git a/conftest.py b/conftest.py
index e0b4426..55e27a2 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,6 +1,18 @@
+import sys
+from _pytest.doctest import DoctestModule
+from py.path import local
+
+
+PY2 = sys.version_info[0] < 3
+
+
 collect_ignore = ['tests/messages/data']
 
-def pytest_configure(config):
-    import sys
-    if sys.version_info[0] < 3:
-        config.option.doctestmodules = True
+
+def pytest_collect_file(path, parent):
+    babel_path = local(__file__).dirpath().join('babel')
+    config = parent.config
+    if PY2:
+        if babel_path.common(path) == babel_path:
+            if path.ext == ".py":
+                return DoctestModule(path, parent)
diff --git a/setup.cfg b/setup.cfg
index 01bb954..18b3eba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,6 @@
 [egg_info]
 tag_build = dev
 tag_svn_revision = true
+
+[pytest]
+norecursedirs = .* _* scripts {args}
diff --git a/tox.ini b/tox.ini
index 3567285..0059112 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,4 +5,4 @@ envlist = py26, py27, pypy, py33
 deps =
     pytz
     pytest
-commands = py.test tests []
+commands = py.test []