diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py
index 2905ae8c..81588bf6 100644
--- a/hooks/quantum_utils.py
+++ b/hooks/quantum_utils.py
@@ -325,8 +325,7 @@ def reassign_agent_resources():
         ''' Try to import neutronclient instead for havana+ '''
         from neutronclient.v2_0 import client
 
-    # TODO: Fixup for https keystone
-    auth_url = 'http://%(keystone_host)s:%(auth_port)s/v2.0' % env
+    auth_url = '%(auth_protocol)s://%(keystone_host)s:%(auth_port)s/v2.0' % env
     quantum = client.Client(username=env['service_username'],
                             password=env['service_password'],
                             tenant_name=env['service_tenant'],
diff --git a/unit_tests/test_quantum_utils.py b/unit_tests/test_quantum_utils.py
index d85810c6..c2df8ff5 100644
--- a/unit_tests/test_quantum_utils.py
+++ b/unit_tests/test_quantum_utils.py
@@ -251,7 +251,8 @@ network_context = {
     'service_tenant': 'baz',
     'region': 'foo-bar',
     'keystone_host': 'keystone',
-    'auth_port': 5000
+    'auth_port': 5000,
+    'auth_protocol': 'https'
 }