diff --git a/tox.ini b/tox.ini
index ddb60556..e1dfd645 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,pypy,pep8,functional,docs
+envlist = py27,pep8,queries,docs
 skipsdist = True
 
 [testenv]