diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh
index 2cc4590b..e235f056 100755
--- a/pmm-tests/pmm-framework.sh
+++ b/pmm-tests/pmm-framework.sh
@@ -2770,6 +2770,12 @@ setup_pmm_pgss_integration () {
   if echo "$pgsql_version" | grep '15'; then
     export PGSQL_VERSION=15
   fi
+  if echo "$pgsql_version" | grep '16'; then
+    export PGSQL_VERSION=16
+  fi
+  if echo "$pgsql_version" | grep '17'; then
+    export PGSQL_VERSION=17
+  fi
   if [ -z "$CLIENT_VERSION" ]
   then
     export CLIENT_VERSION=dev-latest
@@ -3060,7 +3066,7 @@ setup_mongo_replica_for_backup() {
   fi
   mkdir /tmp/backup_data && chmod 777 /tmp/backup_data
   pushd qa-integration/pmm_psmdb-pbm_setup
-  PSMDB_VERSION=$(wget -q --post-data "version=percona-server-mongodb-${mo_version}" https://www.percona.com/products-api.php -O - | grep  -oP "(?<=value\=\")[^\"]*" | sort -V | tail -1 | sed -n -e 's/^.*\(mongodb-\)//p') COMPOSE_PROFILES=extra ./start-rs-only.sh
+  PSMDB_VERSION1=$(wget -q --post-data "version=percona-server-mongodb-${mo_version}" https://www.percona.com/products-api.php -O - | grep  -oP "(?<=value\=\")[^\"]*" | sort -V | tail -1 | sed -n -e 's/^.*\(mongodb-\)//p') COMPOSE_PROFILES=extra ./start-rs-only.sh
   popd
   popd
 }