diff --git a/Makefile b/Makefile
index c676c15..fc6f55b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
-init:
-	pip install -r requirements.txt
+clean:
+	find celigo -name \*.pyc -delete
+	find celigo -name \*__pycache__ -delete
+	rm -rf build-*
+	rm -rf *egg*
+	rm -rf dist
 
-test:
-	tox
+tox: 
+	./make_tox.sh
+
+test-all: tox
+
+all: clean test-all
diff --git a/make_tox.sh b/make_tox.sh
new file mode 100755
index 0000000..2e8751f
--- /dev/null
+++ b/make_tox.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+export PYENV_ROOT="$HOME/.pyenv"    
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+pyenv shell 2.7.11 3.3.6 3.4.4 3.5.1 pypy-5.0.0
+pyenv rehash
+tox
diff --git a/tox.ini b/tox.ini
index 07ba670..2095f7e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35,pypy
+envlist = py27,py33,py34,py35,pypy-5.0.0
 
 [testenv]
 deps=