1 files changed, 5 insertions, 16 deletions
diff --git a/tox.ini b/tox.ini
index dafaaf6d..b92ebac1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,15 @@
 [tox]
+
 envlist = py27,py3,flake8
 recreate = True
+usedevelop = True
 
 [testenv]
 commands = python -m nose {posargs:tests}
 deps = -r{toxinidir}/test-requirements.txt
-    -r{toxinidir}/requirements.txt
-
-[testenv:py3]
-basepython = python3
+       -r{toxinidir}/requirements.txt
+setenv =
+    LC_ALL = en_US.utf-8
 
 [testenv:flake8]
 basepython = python3
@@ -18,18 +19,6 @@ commands = {envpython} -m flake8 {posargs:cloudinit/ tests/ tools/}
 setenv =
     LC_ALL = en_US.utf-8
 
-[testenv:py26]
-commands = nosetests {posargs:tests}
-deps =
-     contextlib2
-     httpretty>=0.7.1
-     mock
-     nose
-     pep8==1.5.7
-     pyflakes
-setenv =
-    LC_ALL = C
-
 [flake8]
 ignore=H404,H405,H105,H301,H104,H403,H101
 exclude = .venv,.tox,dist,doc,*egg,.git,build,tools