diff --git a/setup.py b/setup.py
index 180374d0c..df035341d 100755
--- a/setup.py
+++ b/setup.py
@@ -85,12 +85,13 @@ setup(
     + (['ordereddict'] if sys.version_info < (2, 7, 0) else []),
 
     tests_require=[
-        'responses',
-        'pyechonest',
-        'mock',
+        'beautifulsoup4',
         'flask',
-        'rarfile',
+        'mock',
+        'pyechonest',
         'pylast',
+        'rarfile',
+        'responses',
     ],
 
     # Plugin (optional) dependencies:
diff --git a/tox.ini b/tox.ini
index 186dfb36f..bc1d3dfd9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,13 +8,14 @@ envlist = py26, py27, pypy, docs, flake8
 
 [testenv]
 deps =
-    nose
-    mock
-    pylast
+    beautifulsoup4
     flask
-    responses
+    mock
+    nose
     pyechonest
+    pylast
     rarfile
+    responses
 commands =
     nosetests {posargs}