diff --git a/requirements-install.sh b/requirements-install.sh
index 2268367e..5f8ba506 100755
--- a/requirements-install.sh
+++ b/requirements-install.sh
@@ -5,16 +5,12 @@ if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
   exit 1
 fi
 
-pip install -r requirements-test.txt --use-mirrors
+pip install -r requirements-test.txt
 
 if [[ $USE_OPTIONAL == "true" && $TRAVIS_PYTHON_VERSION != "pypy" ]]; then
   if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then
-    pip install -r requirements-optional-2.6.txt --use-mirrors
+    pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-2.6.txt
   else
-    pip install -r requirements-optional-cpython.txt --use-mirrors
+    pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-cpython.txt
   fi
 fi
-
-if [[ $FLAKE == "true" ]]; then
-  pip install --use-mirrors flake8
-fi
diff --git a/tox.ini b/tox.ini
index 53c2aae0..9e0a5ee3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,8 @@ deps =
 commands =
   {envbindir}/nosetests -q
   {toxinidir}/flake8-run.sh
+install_command =
+  pip install --allow-external Genshi --allow-insecure Genshi {opts} {packages}
 
 [testenv:pypy]
 # lxml doesn't work and datrie doesn't make sense