diff --git a/apps/remix-ide-e2e/src/tests/debugger.test.ts b/apps/remix-ide-e2e/src/tests/debugger.test.ts
index fe9204348d..cdde3de806 100644
--- a/apps/remix-ide-e2e/src/tests/debugger.test.ts
+++ b/apps/remix-ide-e2e/src/tests/debugger.test.ts
@@ -16,7 +16,7 @@ module.exports = {
   'Should launch debugger': function (browser: NightwatchBrowser) {
     browser.addFile('blah.sol', sources[0]['browser/blah.sol'])
     .clickLaunchIcon('udapp')
-    .waitForElementPresent('*[title="Deploy - transact (not payable)"]')
+    .waitForElementPresent('*[title="Deploy - transact (not payable)"]', 35000)
     .click('*[title="Deploy - transact (not payable)"]')
     .debugTransaction(0)
     .assert.containsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER')
@@ -178,7 +178,7 @@ const sources = [
   {
     'browser/blah.sol': {
       content: `
-    pragma solidity >=0.4.22 <0.7.0;
+    pragma solidity >=0.7.0 <0.8.0;
 
     contract Kickstarter {
 
@@ -193,7 +193,7 @@ const sources = [
 
         Project[] public projects;    
 
-        constructor() public {
+        constructor() {
 
         }
 
diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
index 7081f0055b..512c00a1bd 100644
--- a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
@@ -346,7 +346,7 @@ const sources = [
     },
     'browser/compilationError_test.sol': {
       content: `
-      pragma solidity ^0.6.1;
+      pragma solidity ^0.7.0;
       
       contract failOnCompilation {
         fallback() {
@@ -357,7 +357,7 @@ const sources = [
     },
     'browser/tests/deployError_test.sol': {
       content: `
-      pragma solidity ^0.8.0;
+      pragma solidity ^0.7.0;
 
       contract failingDeploy {
           constructor() {
@@ -368,7 +368,7 @@ const sources = [
     },
     'browser/tests/methodFailure_test.sol': {
       content: `
-      pragma solidity ^0.8.0;
+      pragma solidity ^0.7.0;
 
       contract methodfailure {
         function add(uint a, uint b) public {
diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
index f07fc59e5d..cf8750f159 100644
--- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
+++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -6,12 +6,12 @@ import sauce from './sauce'
 const sources = [
   {
     'browser/Untitled.sol': {content: `
-pragma solidity >=0.4.22 <0.7.0;
+pragma solidity >=0.6.0 <0.8.0;
 contract test1 { address test = tx.origin; }
 contract test2 {}
 contract TooMuchGas {
   uint x;
-  function() external { 
+  fallback() external { 
       x++;
     uint test;
     uint test1;
@@ -36,6 +36,7 @@ function runTests (browser: NightwatchBrowser) {
   browser
     .waitForElementVisible('#icon-panel', 10000)
     .clickLaunchIcon('solidity')
+    .pause(10000)
     .testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['TooMuchGas', 'test1', 'test2'])
     .clickLaunchIcon('solidityStaticAnalysis')
     .click('#staticanalysisView button')