2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ba16492..56340356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,8 @@
  - Azure: get instance id from dmi instead of SharedConfig (LP: #1506187)
  - systemd/power_state: fix power_state to work even if cloud-final
    exited non-zero (LP: #1449318)
+ - SmartOS: Add support for Joyent LX-Brand Zones (LP: #1540965)
+   [Robert C Jennings]
 0.7.6:
  - open 0.7.6
  - Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/tox.ini b/tox.ini
index 3619edf4..849481f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,11 @@
 [tox]
-envlist = py26,py27,py34
+envlist = py27,py34
 recreate = True
 
 [testenv]
 commands = python -m nose {posargs:tests}
-deps =
-     contextlib2
-     httpretty>=0.7.1
-     mock
-     nose
-     pep8==1.5.7
-     pyflakes
+deps = -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
 
 # https://github.com/gabrielfalcao/HTTPretty/issues/223
 setenv =