diff --git a/packages/plugins/ethereum-blockchain-client/src/index.js b/packages/plugins/ethereum-blockchain-client/src/index.js
index 2837d50eee..8ab730a37c 100644
--- a/packages/plugins/ethereum-blockchain-client/src/index.js
+++ b/packages/plugins/ethereum-blockchain-client/src/index.js
@@ -70,8 +70,7 @@ class EthereumBlockchainClient {
       }
 
       if (!contract.gasPrice) {
-        const gasPrice = await web3.eth.getGasPrice();
-        contract.gasPrice = contract.gasPrice || gasPrice;
+        contract.gasPrice = await web3.eth.getGasPrice();
       }
 
       embarkJsUtils.secureSend(web3, contractObject, {
diff --git a/packages/plugins/ganache/src/index.js b/packages/plugins/ganache/src/index.js
index ebbc3b8aa3..c6f6d83b22 100644
--- a/packages/plugins/ganache/src/index.js
+++ b/packages/plugins/ganache/src/index.js
@@ -2,7 +2,9 @@ class Ganache {
   constructor(embark) {
     embark.events.request('blockchain:vm:register', () => {
       const ganache = require('ganache-cli');
-      return ganache.provider();
+      // Default to 8000000, which is the server default
+      // Somehow, the provider default is 6721975
+      return ganache.provider({gasLimit: '0x7A1200'});
     });
   }
 }
diff --git a/packages/plugins/mocha-tests/src/lib/index.js b/packages/plugins/mocha-tests/src/lib/index.js
index d3581bebf4..fe6032a2bd 100644
--- a/packages/plugins/mocha-tests/src/lib/index.js
+++ b/packages/plugins/mocha-tests/src/lib/index.js
@@ -7,7 +7,7 @@ const Web3 = require('web3');
 
 const Reporter = require('./reporter');
 
-const GAS_LIMIT = 6000000;
+const GAS_LIMIT = 8000000;
 const JAVASCRIPT_TEST_MATCH = /^.+\.js$/i;
 const TEST_TIMEOUT = 15000; // 15 seconds in milliseconds