diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
index ab10e5216a..0e61c86cec 100644
--- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
+++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -34,7 +34,7 @@ module.exports = {
   'run analysis and filter results': function (browser: NightwatchBrowser) {
     browser
     .clickLaunchIcon('filePanel')
-    .click('*[data-id="treeViewLitreeViewItemcontracts"]')
+    .click('*[data-id="treeViewLitreeViewItemcontracts"]') //
     .click('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
     .clickLaunchIcon('solidity')
     .click('*[id="compileBtn"]')
@@ -44,18 +44,19 @@ module.exports = {
     .waitForElementPresent('#staticanalysisresult .warning', 5000)
     // Check warning count
     .click('*[data-rb-event-key="basic"]')
-    .pause(3000)
-    .assert.containsText('*[data-id="StaticAnalysisErrorCount"]', '1')
+    // .pause(3000)
+    // .assert.containsText('*[data-id="RemixStaticAnalysisErrorCount"]', '1')
+    .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1')
     .verify.elementPresent('input[name="showLibWarnings"]')
     .verify.not.elementPresent('input[name="showLibWarnings"]:checked')
     .verify.elementPresent('label[id="headingshowLibWarnings"]')
     .click('label[id="headingshowLibWarnings"]')
     .pause(1000)
     .click('*[data-rb-event-key="basic"]')
-    .assert.containsText('*[data-id="StaticAnalysisErrorCount"]', '382')
+    .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '382')
     .click('label[id="headingshowLibWarnings"]')
     .pause(1000)
-    .assert.containsText('*[data-id="StaticAnalysisErrorCount"]', '1')
+    .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '1')
     .end()
   }
 }