diff --git a/HACKING.rst b/HACKING.rst
index 62dc8b1..b1f2569 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -55,6 +55,6 @@ Manual tests:
 OpenStack Style Commandments
 ============================
 
-- Step 1: Read http://www.python.org/dev/peps/pep-0008/
-- Step 2: Read http://www.python.org/dev/peps/pep-0008/ again
-- Step 3: Read https://github.com/openstack-dev/hacking/blob/master/HACKING.rst
+- Step 1: Read https://www.python.org/dev/peps/pep-0008/
+- Step 2: Read https://www.python.org/dev/peps/pep-0008/ again
+- Step 3: Read https://github.com/openstack/hacking/blob/master/HACKING.rst
diff --git a/test-requirements.txt b/test-requirements.txt
index c6fb11c..9b13ff1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,5 +15,6 @@ xvfbwrapper>=0.1.3 #license: MIT
 
 # Doc requirements
 openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
 reno>=2.5.0 # Apache-2.0
diff --git a/watcher_dashboard/test/integration_tests/horizon.conf b/watcher_dashboard/test/integration_tests/horizon.conf
index 984c1c7..d9a1b4c 100644
--- a/watcher_dashboard/test/integration_tests/horizon.conf
+++ b/watcher_dashboard/test/integration_tests/horizon.conf
@@ -7,7 +7,7 @@
 dashboard_url=http://localhost:8000/
 
 # Dashboard help page url (string value)
-help_url=http://docs.openstack.org/
+help_url=https://docs.openstack.org/
 
 [selenium]
 # Timeout in seconds to wait for a page to become available