diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh
index f3649d8cc6..18fe5fd0c8 100755
--- a/contrib/ci/post_test_hook.sh
+++ b/contrib/ci/post_test_hook.sh
@@ -56,23 +56,6 @@ else
 fi
 iniset $TEMPEST_CONFIG share backend_names $BACKENDS_NAMES
 
-# If testing a stable branch, we need to ensure we're testing with supported
-# API micro-versions; so set the versions from code if we're not testing the
-# master branch. If we're testing master, we'll allow manila-tempest-plugin
-# (which is branchless) tell us what versions it wants to test.
-if [[ $ZUUL_BRANCH != "master" ]]; then
-    # Grab the supported API micro-versions from the code
-    _API_VERSION_REQUEST_PATH=$BASE/new/manila/manila/api/openstack/api_version_request.py
-    _DEFAULT_MIN_VERSION=$(awk '$0 ~ /_MIN_API_VERSION = /{print $3}' $_API_VERSION_REQUEST_PATH)
-    _DEFAULT_MAX_VERSION=$(awk '$0 ~ /_MAX_API_VERSION = /{print $3}' $_API_VERSION_REQUEST_PATH)
-    # Override the *_api_microversion tempest options if present
-    MANILA_TEMPEST_MIN_API_MICROVERSION=${MANILA_TEMPEST_MIN_API_MICROVERSION:-$_DEFAULT_MIN_VERSION}
-    MANILA_TEMPEST_MAX_API_MICROVERSION=${MANILA_TEMPEST_MAX_API_MICROVERSION:-$_DEFAULT_MAX_VERSION}
-    # Set these options in tempest.conf
-    iniset $TEMPEST_CONFIG share min_api_microversion $MANILA_TEMPEST_MIN_API_MICROVERSION
-    iniset $TEMPEST_CONFIG share max_api_microversion $MANILA_TEMPEST_MAX_API_MICROVERSION
-fi
-
 # Set two retries for CI jobs
 iniset $TEMPEST_CONFIG share share_creation_retry_number 2
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 7d3d983b2d..f618dd6384 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -946,6 +946,10 @@ function update_tempest {
         iniset $TEMPEST_CONFIG identity alt_password $ADMIN_PASSWORD
         iniset $TEMPEST_CONFIG identity alt_tenant_name ${ALT_TENANT_NAME:-"alt_demo"}
         iniset $TEMPEST_CONFIG identity alt_domain_name $ADMIN_DOMAIN_NAME
+
+        # Max API micro-version for tempest tests
+        iniset $TEMPEST_CONFIG share min_api_microversion 2.0
+        iniset $TEMPEST_CONFIG share max_api_microversion 2.57
     fi
 }