diff --git a/.gitignore b/.gitignore
index 13016c332..ee2cd20bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .*.swp
-.env
+.tox
 *.pyc
 build/
 dist/
diff --git a/.travis.yml b/.travis.yml
index cdb73c3d5..58cb9444c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: python
 python:
-      - "2.7"
-install: make test_env
-script: make test
+    - "2.7"
+script: tox -e py27
diff --git a/README.rst b/README.rst
index 224696262..1ade07351 100644
--- a/README.rst
+++ b/README.rst
@@ -75,20 +75,27 @@ Run as ``root``::
 Developing
 ~~~~~~~~~~
 
-Checkout and create an environment::
+First of all, install *tox* utility. It's likely to be in your distribution
+repositories under name of ``python-tox``. Alternatively, you can install it
+from PyPI.
+
+Next checkout and create environments::
 
     git clone https://github.com/Divius/ironic-discoverd.git
     cd ironic-discoverd
-    make test_env
+    tox
 
-Run test suite::
+Repeat *tox* command each time you need to run tests. If you don't have Python
+interpreter of one of supported versions (currently 2.6, 2.7 and 3.3), use
+``-e`` flag to select only some environments, e.g.
 
-    make test
+::
+
+    tox -e py27
 
 Install and run::
 
-    source .env/bin/activate
-    python setup.py develop
+    source .tox/py27/bin/activate
     ironic-discoverd example.conf
 
 Of course you may have to modify ``example.conf`` to match your OpenStack
diff --git a/ironic_discoverd/test.py b/ironic_discoverd/test.py
index 7d429560d..20c3e2744 100644
--- a/ironic_discoverd/test.py
+++ b/ironic_discoverd/test.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import unittest
 
 from ironicclient import exceptions
@@ -115,3 +117,7 @@ class TestDiscover(unittest.TestCase):
         cli.node.update.assert_any_call('uuid1', patch)
         cli.node.update.assert_any_call('uuid3', patch)
         self.assertEqual(2, cli.node.update.call_count)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..ebf95afa3
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,10 @@
+[tox]
+envlist = py26,py27,py33
+[testenv]
+usedevelop = True
+deps=
+    -rrequirements.txt
+    mock
+    flake8
+commands=
+    python ironic_discoverd/test.py