diff --git a/.gitignore b/.gitignore
index 58c8db0..b70270c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ untangle.egg-info
 .tox/
 tox.init
 untangle-*.tar.gz
+.cache/*
diff --git a/.travis.yml b/.travis.yml
index 5212cba..00ba475 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,13 @@ language: python
 python:
     - 2.6
     - 2.7
-    - 3.2
     - 3.3
     - 3.4
+    - 3.5
     - pypy
 install:
   - pip install coveralls
-script: 
+script:
   coverage run --source=untangle ./setup.py test
 
 after_success:
diff --git a/Makefile b/Makefile
index 58c8bcf..fdc665b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ compile:
 	python -m compileall -q untangle.py tests/tests.py
 
 test:
-	nosetests --exe tests/
+	tox
 
 # needs python-stdeb
 package_deb:
diff --git a/README.md b/README.md
index 8b1134b..a7c9172 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-untangle 
+untangle
 ========
 
 [![Build Status](https://secure.travis-ci.org/stchris/untangle.png?branch=master)](http://travis-ci.org/stchris/untangle) [![Code Quality](https://landscape.io/github/stchris/untangle/master/landscape.png)](https://landscape.io/github/stchris/untangle/master) [![Coverage Status](https://coveralls.io/repos/stchris/untangle/badge.png)](https://coveralls.io/r/stchris/untangle) [![PyPi version](https://img.shields.io/pypi/v/untangle.svg)](https://pypi.python.org/pypi/untangle) [![PyPi downloads](https://img.shields.io/pypi/dm/untangle.svg)](https://pypi.python.org/pypi/untangle)
@@ -9,12 +9,12 @@ untangle
 [Documentation](http://readthedocs.org/docs/untangle/en/latest/)
 
 
-* Converts XML to a Python object. 
-* Siblings with similar names are grouped into a list. 
+* Converts XML to a Python object.
+* Siblings with similar names are grouped into a list.
 * Children can be accessed with ``parent.child``, attributes with ``element['attribute']``.
 * You can call the ``parse()`` method with a filename, an URL or an XML string.
 * Substitutes ``-``, ``.`` and ``:`` with ``_`` ``<foobar><foo-bar/></foobar>`` can be accessed with ``foobar.foo_bar``, ``<foo.bar.baz/>`` can be accessed with ``foo_bar_baz`` and ``<foo:bar><foo:baz/></foo:bar>`` can be accessed with ``foo_bar.foo_baz``
-* Works with Python 2.4-3.2 and pypy
+* Works with Python 2.5, 2.6, 2.7 and 3.3, 3.4, 3.5 and pypy
 
 Installation
 ------------
diff --git a/tests/tests.py b/tests/tests.py
index 86ce9b2..0dc89f4 100755
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -172,7 +172,8 @@ def test_namespace(self):
             'compact vam',
             template.table.tr.xsl_for_each.td['class']
         )
-        self.assert_(
+        self.assertEquals(
+            untangle.Element('',''),
             template.table.tr.xsl_for_each.td.xsl_apply_templates
         )
 
@@ -183,7 +184,10 @@ def test_namespace(self):
             'compact tac formula italic',
             last_template.p['class']
         )
-        self.assert_(last_template.p.xsl_apply_templates)
+        self.assertEquals(
+            untangle.Element('xsl_apply_templates',''),
+            last_template.p.xsl_apply_templates
+        )
 
 
 class IterationTestCase(unittest.TestCase):
diff --git a/tox.ini b/tox.ini
index 26a31d1..80fc230 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,9 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py25, py26, py27, py31, py32, py33, py34, pypy
+envlist = py25, py26, py27, py33, py34, py35, pypy
+skip_missing_interpreters = true
 
 [testenv]
-commands = make test
+commands = py.test tests/tests.py
 deps = pytest
-
diff --git a/untangle.py b/untangle.py
index 64269f0..7f20469 100755
--- a/untangle.py
+++ b/untangle.py
@@ -13,7 +13,6 @@
  Author: Christian Stefanescu (http://0chris.com)
  License: MIT License - http://www.opensource.org/licenses/mit-license.php
 """
-
 import os
 from xml.sax import make_parser, handler
 try: