diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 45acd8bddc..adb113cca5 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -95,5 +95,10 @@ function _config_tempest_plugin
 _config_functionaltests
 _config_tempest_plugin
 
-openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512
-openstack flavor show m1.heat_micro || openstack flavor create m1.heat_micro --ram 128
+# (FIXME) Remove this after backport to stable/rocky
+# Remove/Recreate existing flavors
+openstack flavor show m1.heat_int && openstack flavor delete m1.heat_int
+openstack flavor show m1.heat_micro && openstack flavor delete m1.heat_micro
+
+openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512 --disk 4
+openstack flavor show m1.heat_micro || openstack flavor create m1.heat_micro --ram 128 --disk 1