diff --git a/tests/configuration/verifyPMMSettingsPageElements_test.js b/tests/configuration/verifyPMMSettingsPageElements_test.js
index b8ce9ab32..6c9ff54d1 100644
--- a/tests/configuration/verifyPMMSettingsPageElements_test.js
+++ b/tests/configuration/verifyPMMSettingsPageElements_test.js
@@ -187,6 +187,10 @@ Scenario('@PMM-T1866 - Verify if public address has an port assigned and followi
   I.fillField(pmmSettingsPage.fields.publicAddressInput, '192.168.1.1:8433');
   pmmSettingsPage.applyChanges();
   I.dontSeeElement(pmmSettingsPage.fields.errorPopUpElement);
+
+  // Remove wait after https://perconadev.atlassian.net/browse/PMM-13340 is fixed
+  I.wait(5);
+  I.refreshPage();
   await pmmSettingsPage.verifySettingsValue(pmmSettingsPage.fields.publicAddressInput, '192.168.1.1:8433');
   // clearField and customClearField methods doesn't work for this field
   I.usePlaywrightTo('clear field', async ({ page }) => {
diff --git a/tests/configuration/verifyPMMSettingsPageFunctionality_test.js b/tests/configuration/verifyPMMSettingsPageFunctionality_test.js
index b4d8d6f28..eabb3186b 100644
--- a/tests/configuration/verifyPMMSettingsPageFunctionality_test.js
+++ b/tests/configuration/verifyPMMSettingsPageFunctionality_test.js
@@ -347,6 +347,8 @@ Scenario(
 
     I.assertTrue(publicAddressValue.length > 0, 'Expected the Public Address Input Field to be not empty!');
     pmmSettingsPage.applyChanges();
+    // Remove wait after https://perconadev.atlassian.net/browse/PMM-13340 is fixed
+    I.wait(5);
     I.refreshPage();
     await pmmSettingsPage.waitForPmmSettingsPageLoaded();
     const publicAddressAfterRefresh = await I.grabValueFrom(pmmSettingsPage.fields.publicAddressInput);
diff --git a/tests/serverLogs_test.js b/tests/serverLogs_test.js
index 27ccf650f..6a55ded04 100644
--- a/tests/serverLogs_test.js
+++ b/tests/serverLogs_test.js
@@ -7,11 +7,13 @@ const filename = 'logs.zip';
 const fileNameToCheck = 'pmm-managed.log';
 const baseUrl = codeceptjsConfig.config.helpers.Playwright.url;
 
-BeforeSuite(async ({ locationsAPI }) => {
+BeforeSuite(async ({ I, locationsAPI }) => {
   // Simple request to generate > 50k lines in logs
   for (let i = 0; i < 13000; i++) {
     await locationsAPI.getLocationsList();
   }
+
+  I.wait(15);
 });
 
 // @settings-fb tag added in order to execute these tests on FB