diff --git a/MANIFEST.in b/MANIFEST.in
index ed784d2..81f690a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 include README.*
 include *.txt
 include setup.py
+include tox.ini
 recursive-include tests *
 recursive-include sample *
diff --git a/README.rst b/README.rst
index 9dc9935..3b00d0e 100644
--- a/README.rst
+++ b/README.rst
@@ -30,6 +30,14 @@ posted to `pypi <https://pypi.python.org/pypi/pyvmomi/>`_
   ``python setup.py develop`` for development install or 
   ``python setup.py install``. 
 
+Testing
+=======
+Unit tests can be invoked by using the ``tox`` command. You may have to
+configure multiple python interpreters so that you can test in all the
+environments listed in ``tox.ini`` or you will have to run ``tox`` with the
+``-e`` flag to run only in your version of python. For example, if you only
+have Python 2.7 then ``tox -e py27`` will limit your test run to Python 2.7.
+
 Contributing
 ============
 * Research `open issues <https://github.com/vmware/pyvmomi/issues?q=is%3Aopen+is%3Aissue>`_
diff --git a/setup.py b/setup.py
index 507da16..bdbf133 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ setup(
    install_requires=required,
    license='License :: OSI Approved :: Apache Software License',
    data_files = [("", ["LICENSE.txt", "NOTICE.txt", "MANIFEST.in",
-                       "setup.py"])],
+                       "setup.py", "tox.ini"])],
    # NOTE: pypi prefers the use of RST to render docs
    long_description=read('README.rst'),
    classifiers=[
diff --git a/test-requirements.txt b/test-requirements.txt
index c55140b..40c8478 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,2 @@
-contextdecorator
-PyYAML>=3.10
 testtools>=0.9.34
 vcrpy
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..0d419a4
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist = py26,py27,py33,py34
+[testenv]
+deps = -rtest-requirements.txt
+commands =
+    python setup.py test