diff --git a/doc/requirements.txt b/doc/requirements.txt
index 101a16f..5b503f8 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,7 +1,8 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-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
 sphinxcontrib-apidoc>=0.2.0  # BSD
 sphinx_rtd_theme>=0.2.4
 reno>=2.5.0 # Apache-2.0
diff --git a/examples/cirros-test.yaml b/examples/cirros-test.yaml
index e2d8657..163e777 100644
--- a/examples/cirros-test.yaml
+++ b/examples/cirros-test.yaml
@@ -6,7 +6,7 @@ vmlist:
         vcpu: 1
         ram_mb: 256
       rootfs:
-        sourceurl: http://stupidest.org/vm/cirros-0.3.5-x86_64-disk.img
+        sourceurl: https://stupidest.org/vm/cirros-0.3.5-x86_64-disk.img
         localtarget: cirros-vm.qcow2
         pvc_size: 128Mi
     netconfig:
diff --git a/examples/demo-ub14-apache.yaml b/examples/demo-ub14-apache.yaml
index dfda9fb..2103bbd 100644
--- a/examples/demo-ub14-apache.yaml
+++ b/examples/demo-ub14-apache.yaml
@@ -6,7 +6,7 @@ vmlist:
         vcpu: 1
         ram_mb: 1024
       rootfs:
-        sourceurl: http://stupidest.org/vm/ubuntu-14.04-amd64.img
+        sourceurl: https://stupidest.org/vm/ubuntu-14.04-amd64.img
         localtarget: ubuntu-14.04-amd64.qcow2
         pvc_size: 5Gi
         pvc_class: managed
diff --git a/examples/ub16-smp-test.yaml b/examples/ub16-smp-test.yaml
index 5551071..ba5c63e 100644
--- a/examples/ub16-smp-test.yaml
+++ b/examples/ub16-smp-test.yaml
@@ -6,7 +6,7 @@ vmlist:
         vcpu: 2
         ram_mb: 2048
       rootfs:
-        sourceurl: http://stupidest.org/vm/cw-ub16-test-3a.qcow2
+        sourceurl: https://stupidest.org/vm/cw-ub16-test-3a.qcow2
         localtarget: cw-ub16-test.qcow2
         pvc_size: 7Gi
     netconfig:
diff --git a/test-requirements.txt b/test-requirements.txt
index e200bfc..9461781 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,5 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-sphinx>=1.6.2
+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
 sphinx_rtd_theme==0.2.4