diff --git a/codeceptjs-e2e/tests/dockerConfiguration/verifySrvDataDirectory_test.js b/codeceptjs-e2e/tests/dockerConfiguration/verifySrvDataDirectory_test.js
index 7910066e9..07311267e 100644
--- a/codeceptjs-e2e/tests/dockerConfiguration/verifySrvDataDirectory_test.js
+++ b/codeceptjs-e2e/tests/dockerConfiguration/verifySrvDataDirectory_test.js
@@ -78,7 +78,7 @@ Scenario(
   },
 );
 
-Scenario(
+Scenario.skip(
   'PMM-T1256 Verify GF_SECURITY_ADMIN_PASSWORD environment variable after upgrade',
   async ({
     I, homePage,
diff --git a/codeceptjs-e2e/tests/pages/homePage.js b/codeceptjs-e2e/tests/pages/homePage.js
index 97dde4187..16b5de775 100644
--- a/codeceptjs-e2e/tests/pages/homePage.js
+++ b/codeceptjs-e2e/tests/pages/homePage.js
@@ -157,7 +157,17 @@ module.exports = {
       'Available and Current versions match',
     );
   },
+  async verifyUpdateStatusIsPresent(expectedVersion) {
+    I.amOnPage(pmmUpgradePage.url);
+    I.switchTo();
+    I.waitForVisible(pmmUpgradePage.elements.newUpdateAvailable, 60);
+    I.waitForVisible(pmmUpgradePage.elements.runningVersion, 30);
+    I.waitForVisible(pmmUpgradePage.elements.newVersion, 30);
 
+    if (expectedVersion) {
+      I.see(expectedVersion, pmmUpgradePage.elements.newVersion);
+    }
+  },
   async verifyPostUpdateWidgetIsPresent() {
     const locators = this.getLocators('latest');
 
@@ -225,8 +235,14 @@ module.exports = {
   },
 
   async verifyPMMServerVersion(expectedVersion) {
-    I.waitForElement(this.fields.updateWidget.latest.currentVersion);
-    const actualVersion = await I.grabTextFrom(this.fields.updateWidget.latest.currentVersion);
+    I.amOnPage(pmmUpgradePage.url);
+    I.switchTo();
+    I.waitForVisible(pmmUpgradePage.elements.runningVersion, 60);
+    const actualVersion = await I.grabTextFrom(pmmUpgradePage.elements.runningVersion);
+
+    if (!expectedVersion) {
+      return;
+    }
 
     I.assertContain(
       actualVersion,
diff --git a/codeceptjs-e2e/tests/pages/pmmUpgradePage.js b/codeceptjs-e2e/tests/pages/pmmUpgradePage.js
index 6414e398a..7f0a0f169 100644
--- a/codeceptjs-e2e/tests/pages/pmmUpgradePage.js
+++ b/codeceptjs-e2e/tests/pages/pmmUpgradePage.js
@@ -2,8 +2,11 @@ class PmmUpgradePage {
   constructor() {
     this.url = 'pmm-ui/updates';
     this.elements = {
+      checkUpdatesNow: locate('button').withText(/Check updates now/i),
+      newUpdateAvailable: locate('h4').withText('New update available'),
+      newVersion: locate('strong').withText('New version:'),
+      runningVersion: locate('p').withText('Running version:'),
       updateNowButton: locate('button').withText('Update now'),
-      checkUpdatesNow: locate('button').withText('Check Updates Now'),
       updateSuccess: locate('p').withText('PMM Server installation complete!'),
     };
   }
diff --git a/codeceptjs-e2e/tests/upgrade/upgradePMM_test.js b/codeceptjs-e2e/tests/upgrade/upgradePMM_test.js
index 6bd2ec5a7..aa4d44405 100644
--- a/codeceptjs-e2e/tests/upgrade/upgradePMM_test.js
+++ b/codeceptjs-e2e/tests/upgrade/upgradePMM_test.js
@@ -58,12 +58,11 @@ Scenario(
   'PMM-T288 - Verify user can see Update widget before upgrade [critical] @pmm-upgrade',
   async ({ I, homePage }) => {
     await I.stopMockingUpgrade();
-    I.amOnPage(homePage.url);
-    await homePage.verifyPreUpdateWidgetIsPresent(versionMinor);
+    await homePage.verifyUpdateStatusIsPresent(process.env.PMM_SERVER_LATEST);
   },
 );
 
-Scenario(
+Scenario.skip(
   'PMM-T3 - Verify user is able to Upgrade PMM version [blocker] @pmm-upgrade',
   async ({ I, homePage }) => {
     await I.stopMockingUpgrade();
diff --git a/e2e_tests/pages/updates.page.ts b/e2e_tests/pages/updates.page.ts
index b5de48681..32824ae81 100644
--- a/e2e_tests/pages/updates.page.ts
+++ b/e2e_tests/pages/updates.page.ts
@@ -16,12 +16,11 @@ export default class UpdatesPage extends BasePage {
   homeUrl = '/pmm-ui/graph/';
   builders = {};
   buttons = {
-    updateNow: this.page.getByRole('button', { name: 'Update now' }),
     whatsNew: this.grafanaIframe().getByRole('link', { name: "What's new" }),
   };
   elements = {
     availableSection: this.page.getByRole('heading', { name: /New update available/i }),
-    newVersionLine: this.page.locator('p').filter({ hasText: 'New version:' }),
+    newVersionLine: this.page.locator('strong').filter({ hasText: 'New version:' }),
     pageTitle: this.page.getByRole('heading', { exact: true, name: 'Updates' }),
   };
   inputs = {};