diff --git a/defaults/main.yml b/defaults/main.yml
index ca6e1a2..d4289b8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 ## Path to pip download/installation script.
-pip_upstream_repo_url: https://bootstrap.pypa.io
+pip_upstream_repo_url: https://raw.github.com/pypa/pip/7.1.1/contrib
 pip_get_pip_url: "{{ pip_upstream_repo_url }}/get-pip.py"
-pip_get_pip_fallback_url: https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+pip_get_pip_fallback_url: https://bootstrap.pypa.io/get-pip.py
 
 # Additional options that you might want to pass to "get-pip.py" when installing pip.
 # Default `pip_get_pip_options` is an empty string.
diff --git a/tox.ini b/tox.ini
index e7f1526..200ff76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = docs,pep8,ansible-syntax,ansible-lint,ansible-functional
+envlist = docs,pep8,ansible-syntax,ansible-lint,functional
 
 [testenv]
 usedevelop = True
@@ -71,7 +71,7 @@ commands =
 changedir = tests
 commands = ansible-lint test.yml
 
-[testenv:ansible-functional]
+[testenv:functional]
 changedir = tests
 commands =
     ansible-playbook -i inventory \