diff --git a/requirements.txt b/requirements.txt
index 751d14bc877..3080e542d63 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=2.4.1 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.8.0 # Apache-2.0
-oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0
+oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0,!=2.6.0 # Apache-2.0
 oslo.middleware>=2.8.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index 9a9619241c4..3a431b02996 100755
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -124,13 +124,11 @@ function _install_databases {
 
     source $DEVSTACK_PATH/lib/database
 
-    disable_service postgresql
     enable_service mysql
     initialize_database_backends
     install_database
     configure_database_mysql
 
-    disable_service mysql
     enable_service postgresql
     initialize_database_backends
     install_database