diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh
index 00a7bbe8e2..68cce7ce10 100755
--- a/contrib/ci/pre_test_hook.sh
+++ b/contrib/ci/pre_test_hook.sh
@@ -41,6 +41,8 @@ echo "MANILA_BACKEND2_CONFIG_GROUP_NAME=paris" >> $localconf
 echo "MANILA_SHARE_BACKEND1_NAME=LONDON" >> $localconf
 echo "MANILA_SHARE_BACKEND2_NAME=PARIS" >> $localconf
 
+echo "MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=${MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE:=True}" >> $localconf
+
 # === Handle script arguments ===
 # First argument is expected to be a boolean-like value for DHSS.
 DHSS=$1
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index c4d03238c5..a0816f1566 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -1176,8 +1176,17 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
     fi
     ###########################################################################
 
-    echo_summary "Fetching and installing manila-tempest-plugin system-wide"
-    install_manila_tempest_plugin
+
+    if [ $(trueorfalse False MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE) == True ]; then
+        echo_summary "Fetching and installing manila-tempest-plugin system-wide"
+        install_manila_tempest_plugin
+        export DEPRECATED_TEXT="$DEPRECATED_TEXT\nInstalling
+        manila-tempest-plugin can be done with the help of its own DevStack
+        plugin by adding: \n\n\t'enable_plugin manila-tempest-plugin
+        https://opendev.org/openstack/manila-tempest-plugin'.\n\nManila's
+        DevStack plugin will stop installing it automatically."
+    fi
+
     echo_summary "Update Tempest config"
     update_tempest
 fi
diff --git a/devstack/settings b/devstack/settings
index a2a0e7a43d..3db37e77f6 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -203,6 +203,11 @@ MANILA_DATA_COPY_CHECK_HASH=${MANILA_DATA_COPY_CHECK_HASH:=True}
 MANILA_SETUP_IPV6=${MANILA_SETUP_IPV6:=False}
 MANILA_RESTORE_IPV6_DEFAULT_ROUTE=${MANILA_RESTORE_IPV6_DEFAULT_ROUTE:=True}
 
+# Install manila-tempest-plugin system-wide
+# This operation has been deprecated. manila-tempest-plugin has a devstack
+# plugin that must be preferred over this approach.
+MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=${MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE:=True}
+
 # Enable manila services
 # ----------------------
 # We have to add Manila to enabled services for screen_it to work
diff --git a/playbooks/legacy/grenade-dsvm-manila/run.yaml b/playbooks/legacy/grenade-dsvm-manila/run.yaml
index 8734aa7b55..1c98e2772f 100644
--- a/playbooks/legacy/grenade-dsvm-manila/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-manila/run.yaml
@@ -34,6 +34,8 @@
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_GRENADE=pullup
 
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
+
           # Basic services needed for grenade manila job using dummy driver
           export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
 
diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
index 99c185602a..418576f572 100644
--- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
@@ -31,6 +31,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -50,6 +51,7 @@
           export PROJECTS="openstack/manila-image-elements $PROJECTS"
 
           export ENABLED_SERVICES=tempest
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
index d0f99b6acc..7e88d23c20 100644
--- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
@@ -31,6 +31,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -52,6 +53,8 @@
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
 
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
+
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',
               # defines mode of a share driver. Boolean-like.
diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
index e87e180837..70a6324e95 100644
--- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
@@ -31,6 +31,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -50,6 +51,7 @@
           export PROJECTS="openstack/manila-image-elements $PROJECTS"
 
           export ENABLED_SERVICES=tempest
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
index 0d20c007ca..66968d83b5 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
@@ -31,6 +31,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
 
@@ -58,6 +60,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # Configure devstack to run manila installation without handling of share servers
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
index ef5e2f95ac..dc633cfddc 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
@@ -31,6 +31,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
 
@@ -58,6 +60,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # Configure devstack to run manila installation without handling of share servers
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
index 91cfbb67dc..d0ae23fb1f 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
@@ -31,6 +31,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
 
@@ -58,6 +60,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # Configure devstack to run manila installation without handling of share servers
diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
index 54ac936dcd..e78a4d4975 100644
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
@@ -30,6 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
 
@@ -57,6 +59,7 @@
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # Configure devstack to run manila installation without handling of share servers
diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
index aa83ef4f76..4863f065db 100644
--- a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
@@ -30,6 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+
           # Enable devstack-plugin-hdfs plugin, to install and configure HDFS.
           enable_plugin devstack-plugin-hdfs https://opendev.org/x/devstack-plugin-hdfs
 
@@ -51,6 +53,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # Configure devstack to run manila installation without handling of share servers
diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
index 472d2dcdb0..c3590a38ff 100644
--- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
@@ -30,6 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -50,6 +51,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
index 9d2efaf914..ca0cc1e2a5 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
@@ -31,6 +31,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -51,6 +52,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
index 0d3a73f4d2..6b6a4de71a 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
@@ -31,6 +31,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -51,6 +52,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
index 05babfa01d..39c9d03247 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
@@ -31,6 +31,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -51,6 +52,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',
diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
index d5bfded998..947caa1145 100644
--- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
@@ -30,6 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -50,6 +51,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
index 2de9d14571..56cce62bde 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
@@ -39,7 +39,7 @@
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
           enable_plugin manila https://opendev.org/openstack/manila
-
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
 
           # Enable CephFS as the backend for Manila.
@@ -76,6 +76,7 @@
           export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
           OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
           export OVERRIDE_ENABLED_SERVICES
 
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
index 755aad7401..bbb5d9327b 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
@@ -39,7 +39,7 @@
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
           enable_plugin manila https://opendev.org/openstack/manila
-
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
 
           # Enable CephFS as the backend for Manila.
@@ -76,6 +76,7 @@
           export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
           OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
           export OVERRIDE_ENABLED_SERVICES
 
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
index 8a5a94388e..c8f8e4646a 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
@@ -30,6 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
 
           EOF
         executable: /bin/bash
@@ -63,6 +64,7 @@
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
           export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           function pre_test_hook {
               # 'dhss' - acronym for 'Driver Handles Share Servers',
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
index 280cf02634..d99c78ef32 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
@@ -39,6 +39,7 @@
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
           enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
           enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
 
           EOF
@@ -56,6 +57,7 @@
 
           export MANILA_SETUP_IPV6=True
           export RUN_MANILA_IPV6_TESTS=True
+          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
 
           # Basic services needed for minimal job
           OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
index d10b6c7bed..ed96428583 100644
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
@@ -46,7 +46,7 @@
           disable_service s-proxy
 
           enable_plugin manila https://opendev.org/openstack/manila
-
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
 
           # Enable CephFS as the backend for Manila.
diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
index cf8d7a17c8..1894c6a880 100644
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
@@ -46,7 +46,7 @@
           disable_service s-proxy
 
           enable_plugin manila https://opendev.org/openstack/manila
-
+          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
 
           # Enable CephFS as the backend for Manila.