diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 14793fff8d..fba95a43ed 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -635,6 +635,10 @@ function octavia_init {
    fi
 }
 
+function _configure_tempest {
+    iniset $TEMPEST_CONFIG service_available octavia "True"
+}
+
 # check for service enabled
 if is_service_enabled $OCTAVIA; then
     if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then # main-ha node stuff only
@@ -669,6 +673,11 @@ if is_service_enabled $OCTAVIA; then
 
         echo_summary "Starting Octavia"
         octavia_start
+    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+        if is_service_enabled tempest; then
+            # Configure Tempest for Congress
+            _configure_tempest
+        fi
     fi
 fi