diff --git a/.gitignore b/.gitignore
index 3bdcd94..c6d18c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,5 @@ MANIFEST
 None
 *.tar.gz
 .directory
-.python-version
\ No newline at end of file
+.python-version
+.tox/
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c58390e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+test:
+	python setup.py test
+
+clean:
+	$(RM) -r build dist src/cchardet/*.cpp src/cchardet.egg-info
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..5061eef
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,3 @@
+[nosetests]
+verbose=1
+nocapture=1
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..d9d1e5b
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py27, py34, py35
+
+[testenv]
+commands =
+    make clean
+    {envpython} setup.py nosetests
+deps =
+    -U
+    cython
+    nose