diff --git a/.hgignore b/.hgignore
index b0e965ec5..ccc9166bc 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,4 +19,6 @@ build/
 dist/
 py.egg-info
 issue/
+env/
 3rdparty/
+.tox
diff --git a/CHANGELOG b/CHANGELOG
index de576838e..620f90880 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ Bug fixes / Maintenance
 - fix issue57 -f|--looponfail to work with xpassing tests
 - fix pyimport() to work with directories
 - streamline py.path.local.mkdtemp implementation and usage
+- don't print empty lines when showing junitxml-filename
 
 Changes between 1.3.0 and 1.3.1
 ==================================================
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..f0c8d8dbe
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,29 @@
+[project]
+distpaths=
+    py
+    setup.py
+    distribute_setup.py
+    README.txt
+    MANIFEST.in
+    LICENSE
+    doc
+    testing
+    conftest.py
+
+testpaths=
+    testing
+    conftest.py
+    
+[test]
+command=py.test --confcutdir=. --junitxml=junit-%(envname)s.xml testing/
+[testenv:py24]
+python=python2.4
+[testenv:py25]
+python=python2.5
+[testenv:py26]
+python=python2.6
+[testenv:jython]
+python=jython
+command=py.test-jython --confcutdir=. --junitxml=junit-%(envname)s.xml testing/
+[testenv:py31]
+python=python3.1