diff --git a/pmm_qa/client_container_ps_setup.sh b/pmm_qa/client_container_ps_setup.sh
index 3b4ffc3c..57337a1d 100644
--- a/pmm_qa/client_container_ps_setup.sh
+++ b/pmm_qa/client_container_ps_setup.sh
@@ -47,7 +47,7 @@ chmod 1777 /tmp || true
 
 ## Deploy DB deployer
 export tar_ball_name=$(ls Percona-Server*)
-dbdeployer unpack ${tar_ball_name} --sandbox-binary=~/ps${ps_version} --flavor=percona  
+dbdeployer unpack ${tar_ball_name} --sandbox-binary=~/ps${ps_version} --flavor=percona
 export db_version_sandbox=$(ls ~/ps${ps_version})
 
 export db_sandbox=$(dbdeployer sandboxes | awk -F' ' '{print $1}')
@@ -120,10 +120,12 @@ if [[ "$number_of_nodes" == 1 ]];then
         pmm-admin add mysql --query-source=$query_source --username=msandbox --password=msandbox --environment=ms-prod --cluster=ps-prod-cluster --replication-set=ps-repl ps-group-replication-node-$j-${SERVICE_RANDOM_NUMBER} --debug 127.0.0.1:$node_port
         node_port=$(($node_port + 1))
         sleep 20
-      done
+        done
    else
       #run_workload 127.0.0.1 msandbox msandbox $node_port mysql mysql-single
       pmm-admin add mysql --query-source=$query_source --username=msandbox --password=msandbox --environment=dev --cluster=dev-cluster --replication-set=repl1 ps-single-${SERVICE_RANDOM_NUMBER} 127.0.0.1:$node_port
+      sleep 20
+      mysql -h 127.0.0.1 -u msandbox -pmsandbox --port $node_port -e "set long_query_time = 0; INSERT INTO T2033 ( ID, Value ) VALUES (1,1)" || true
    fi
 else
      dbdeployer deploy multiple ${db_version_sandbox} --sandbox-binary=~/ps${ps_version} --nodes $number_of_nodes --force --remote-access=% --bind-address=0.0.0.0 --my-cnf-options=gtid_mode=ON --my-cnf-options=enforce-gtid-consistency=ON --my-cnf-options=binlog-format=ROW --my-cnf-options=log-slave-updates=ON --my-cnf-options=binlog-checksum=NONE ${my_cnf_options:+--my-cnf-options="$my_cnf_options"}
@@ -172,6 +174,8 @@ else
         fi
         #run_workload 127.0.0.1 msandbox msandbox $node_port mysql mysql-multiple-node
         sleep 20
+
+        mysql -h 127.0.0.1 -u msandbox -pmsandbox --port $node_port -e "set long_query_time = 0; INSERT INTO T2033 ( ID, Value ) VALUES (1,1)" || true
     done
 fi
 
diff --git a/pmm_qa/pg_stat_statements_setup.sh b/pmm_qa/pg_stat_statements_setup.sh
index 550d8131..2521c4c4 100644
--- a/pmm_qa/pg_stat_statements_setup.sh
+++ b/pmm_qa/pg_stat_statements_setup.sh
@@ -84,6 +84,7 @@ echo "CREATE DATABASE sbtest2;" >> /home/postgres/init.sql
 echo "CREATE USER pmm WITH PASSWORD 'pmm';" >> /home/postgres/init.sql
 echo "GRANT pg_monitor TO pmm;" >> /home/postgres/init.sql
 echo "ALTER USER postgres PASSWORD 'pass+this';" >> /home/postgres/init.sql
+echo "ALTER SYSTEM SET max_locks_per_transaction = 1024;" >> /home/postgres/init.sql
 
 # Start server, run init.sql and Create extension PGSM
 service postgresql start