diff --git a/manila/post_test_hook.sh b/manila/post_test_hook.sh
index e80b80f..18885e5 100644
--- a/manila/post_test_hook.sh
+++ b/manila/post_test_hook.sh
@@ -66,6 +66,23 @@ elif [[ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]]; then
     iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols nfs
 fi
 
+# 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