diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index 09ec283572..b44b17746e 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -49,7 +49,7 @@ module.exports = {
 
   'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
     browser.pause(500)
-      .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
+      .click('*[data-id="txLoggerDebugButton0xf88bc0ac0761f78d8c883b32550c68dadcdb095595c30e1a1b7c583e5e958dcb"]')
       .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
       .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
       .pause(2000)
diff --git a/apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts b/apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts
index 04439e0185..a3bf500ec0 100644
--- a/apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot_0_4_11.spec.ts
@@ -45,7 +45,7 @@ module.exports = {
 
   'Debug Ballot / delegate': function (browser: NightwatchBrowser) {
     browser.pause(500)
-      .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]')
+      .click('*[data-id="txLoggerDebugButton0xf88bc0ac0761f78d8c883b32550c68dadcdb095595c30e1a1b7c583e5e958dcb"]')
       .pause(2000)
       .waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
       .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
diff --git a/apps/remix-ide-e2e/src/tests/debugger.spec.ts b/apps/remix-ide-e2e/src/tests/debugger.spec.ts
index 6365793479..d6b1cb2743 100644
--- a/apps/remix-ide-e2e/src/tests/debugger.spec.ts
+++ b/apps/remix-ide-e2e/src/tests/debugger.spec.ts
@@ -420,7 +420,7 @@ const localVariable_step717_ABIEncoder = { // eslint-disable-line
 
 const jsGetTrace = `(async () => {
   try {
-      const result = await remix.call('debugger', 'getTrace', '0xbf309c0d71579d595f04a42e89d66d1ec17523dd3edea710b03f46a9b82ee0af')
+      const result = await remix.call('debugger', 'getTrace', '0xa38bff6f06e7c4fc91df1db6aa31a69ab5d5882faa953b1e7a88bfa523268ed7')
       console.log('result ', result)
   } catch (e) {
       console.log(e.message)
@@ -429,7 +429,7 @@ const jsGetTrace = `(async () => {
 
 const jsDebug = `(async () => {    
   try {
-      const result = await remix.call('debugger', 'debug', '0xbf309c0d71579d595f04a42e89d66d1ec17523dd3edea710b03f46a9b82ee0af')
+      const result = await remix.call('debugger', 'debug', '0xa38bff6f06e7c4fc91df1db6aa31a69ab5d5882faa953b1e7a88bfa523268ed7')
       console.log('result ', result)
   } catch (e) {
       console.log(e.message)
diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index c3a43f5bc4..2ea3d11d54 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -113,7 +113,7 @@ export class Transactions {
   }
 
   eth_estimateGas (payload, cb) {
-    cb(null, 3000000)
+    cb(null, 10000000 * 8)
   }
 
   eth_getCode (payload, cb) {
diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts
index a72be89d1e..a6406b2391 100644
--- a/libs/remix-simulator/src/vm-context.ts
+++ b/libs/remix-simulator/src/vm-context.ts
@@ -122,7 +122,8 @@ export class VMContext {
     const vm = new VM({
       common,
       activatePrecompiles: true,
-      stateManager: stateManager
+      stateManager: stateManager,
+      allowUnlimitedContractSize: true
     })
 
     const web3vm = new remixLibVm.Web3VMProvider()
diff --git a/libs/remix-tests/src/deployer.ts b/libs/remix-tests/src/deployer.ts
index 1e3fcb8d88..aeefac3faa 100644
--- a/libs/remix-tests/src/deployer.ts
+++ b/libs/remix-tests/src/deployer.ts
@@ -110,7 +110,7 @@ export function deployAll (compileResult: compilationInterface, web3: Web3, with
         const params = '' // we suppose that the test contract does not have any param in the constructor
         execution.txFormat.encodeConstructorCallAndDeployLibraries(contractName, contract.raw, compileResult, params, funAbi, encodeDataFinalCallback, encodeDataStepCallback, encodeDataDeployLibraryCallback)
       }, function (err) {
-        if (err) next(err)
+        if (err) return next(err)
         next(null, contracts)
       })
     }
diff --git a/libs/remix-tests/src/runTestFiles.ts b/libs/remix-tests/src/runTestFiles.ts
index 6bde83e44e..b447452f22 100644
--- a/libs/remix-tests/src/runTestFiles.ts
+++ b/libs/remix-tests/src/runTestFiles.ts
@@ -63,9 +63,16 @@ export function runTestFiles (filepath: string, isDirectory: boolean, web3: Web3
       }
       deployAll(compilationResult, web3, false, (err, contracts) => {
         if (err) {
-          next(err)
-        }
-        next(null, compilationResult, contracts)
+          // If contract deployment fails because of 'Out of Gas' error, try again with double gas
+          // This is temporary, should be removed when remix-tests will have a dedicated UI to
+          // accept deployment params from UI
+          if (err.message.includes('The contract code couldn\'t be stored, please check your gas limit')) {
+            deployAll(compilationResult, web3, true, (error, contracts) => {
+              if (error) next([{ message: 'contract deployment failed after trying twice: ' + error.message, severity: 'error' }]) // IDE expects errors in array
+              else next(null, compilationResult, contracts)
+            })
+          } else { next([{ message: 'contract deployment failed: ' + err.message, severity: 'error' }]) } // IDE expects errors in array
+        } else { next(null, compilationResult, contracts) }
       })
     },
     function determineTestContractsToRun (compilationResult: compilationInterface, contracts: any, next) {
diff --git a/libs/remix-tests/src/testRunner.ts b/libs/remix-tests/src/testRunner.ts
index d64398b390..66efa143fe 100644
--- a/libs/remix-tests/src/testRunner.ts
+++ b/libs/remix-tests/src/testRunner.ts
@@ -238,7 +238,7 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
         sender = opts.accounts[sender]
       }
     }
-    let sendParams: Record<string, string> | null = null
+    let sendParams: Record<string, any> | null = null
     if (sender) sendParams = { from: sender }
     if (func.inputs && func.inputs.length > 0) { return resultsCallback(new Error(`Method '${func.name}' can not have parameters inside a test contract`), { passingNum, failureNum, timePassed }) }
     const method = testObject.methods[func.name].apply(testObject.methods[func.name], [])
@@ -280,6 +280,8 @@ export function runTest (testName: string, testObject: any, contractDetails: Com
           else sendParams = { value }
         }
       }
+      if (!sendParams) sendParams = {}
+      sendParams.gas = 10000000 * 8
       method.send(sendParams).on('receipt', (receipt) => {
         try {
           const time: number = (Date.now() - startTime) / 1000.0