diff --git a/.zuul.yaml b/.zuul.yaml
index a64c46ebdf..73e20809ad 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -14,7 +14,7 @@
       - openstack/heat
       - openstack/heat-tempest-plugin
       - openstack/neutron
-      - openstack/neutron-lbaas
+      - openstack/octavia
       - openstack/oslo.messaging
       - openstack/python-barbicanclient
       - openstack/python-heatclient
diff --git a/heat_integrationtests/pre_test_hook.sh b/heat_integrationtests/pre_test_hook.sh
index b9b53c8a17..0933329b41 100755
--- a/heat_integrationtests/pre_test_hook.sh
+++ b/heat_integrationtests/pre_test_hook.sh
@@ -51,9 +51,3 @@ fi
 
 echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf
 echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localconf
-# Use the lbaas v2 namespace driver for devstack integration testing since
-# octavia uses nested vms.
-if [[ $OVERRIDE_ENABLED_SERVICES =~ "q-lbaasv2" ]]
-then
-  echo "NEUTRON_LBAAS_SERVICE_PROVIDERV2=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default" >> $localconf
-fi
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 656172486e..9faa4c7bac 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -79,8 +79,12 @@ function _config_tempest_plugin
 
     # Skip VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300
     # Skip test_server_signal_userdata_format_software_config is skipped untill bug #1651768 is resolved
-    iniset $conf_file heat_plugin skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest'
-    iniset $conf_file heat_plugin skip_functional_test_list ''
+    # Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
+    iniset $conf_file heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, \
+        SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest'
+
+    # Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
+    iniset $conf_file heat_plugin skip_functional_test_list 'LoadBalancerv2Test'
 
     cat $conf_file
 }
diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml
index 82fd4b6974..a0437dfe5d 100644
--- a/playbooks/devstack/functional/run.yaml
+++ b/playbooks/devstack/functional/run.yaml
@@ -61,15 +61,13 @@
 
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
 
-          # Enable LBaaS V2 plugin
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
+          # Enable octavia plugin and services
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_SIZE=3"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial"
-          # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it
-          services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api
+          services+=,octavia,o-cw,o-hk,o-hm,o-api
+          export PROJECTS="openstack/octavia $PROJECTS"
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
           export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"