diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 156683baa3..dde2902ba9 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -312,7 +312,7 @@ function octavia_configure {
     configure_keystone_authtoken_middleware $OCTAVIA_CONF octavia
 
     # Ensure config is set up properly for authentication as admin
-    iniset $OCTAVIA_CONF service_auth auth_url $OS_AUTH_URL
+    iniset $OCTAVIA_CONF service_auth auth_url $KEYSTONE_SERVICE_URI
     iniset $OCTAVIA_CONF service_auth auth_type password
     iniset $OCTAVIA_CONF service_auth username $OCTAVIA_USERNAME
     iniset $OCTAVIA_CONF service_auth password $OCTAVIA_PASSWORD
diff --git a/octavia/tests/functional/api/test_healthcheck.py b/octavia/tests/functional/api/test_healthcheck.py
index cdf497132b..a00687b28a 100644
--- a/octavia/tests/functional/api/test_healthcheck.py
+++ b/octavia/tests/functional/api/test_healthcheck.py
@@ -48,6 +48,10 @@ class TestHealthCheck(base_db_test.OctaviaDBTestBase):
         cfg.CONF.register_opts(healthcheck_opts, group='healthcheck')
 
         self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
+        # Mock log_opt_values, it prevents the dump of the configuration
+        # with LOG.info for each test. It saves a lot of time when running
+        # the functional tests.
+        self.conf.conf.log_opt_values = mock.MagicMock()
         self.conf.config(group='healthcheck', backends=['octavia_db_check'])
         self.conf.config(group='api_settings', healthcheck_refresh_interval=5)
         self.UNAVAILABLE = (healthcheck_plugins.OctaviaDBHealthcheck.
diff --git a/octavia/tests/functional/api/v2/base.py b/octavia/tests/functional/api/v2/base.py
index b4cd87e0b8..5a012e0f25 100644
--- a/octavia/tests/functional/api/v2/base.py
+++ b/octavia/tests/functional/api/v2/base.py
@@ -101,6 +101,10 @@ class BaseAPITest(base_db_test.OctaviaDBTestBase):
     def setUp(self):
         super().setUp()
         self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
+        # Mock log_opt_values, it prevents the dump of the configuration
+        # with LOG.info for each test. It saves a lot of time when running
+        # the functional tests.
+        self.conf.conf.log_opt_values = mock.MagicMock()
         self.conf.config(group="controller_worker",
                          network_driver='network_noop_driver')
         self.conf.config(group='api_settings', auth_strategy=constants.NOAUTH)