diff --git a/scripts/run-blockchain.sh b/scripts/run-blockchain.sh
new file mode 100755
index 000000000..0803cfcb4
--- /dev/null
+++ b/scripts/run-blockchain.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+start_testrpc() {
+  npm run testrpc
+}
+
+start_blockchain() {
+  cd $PWD/test-blockchain
+  bash run-docker.sh
+  cd ..
+}
+
+echo "Starting our own geth instance"
+start_blockchain
+
+echo "Starting our own testrpc instance"
+start_testrpc
+
+
diff --git a/scripts/run-test.sh b/scripts/run-test.sh
index ff2f552f8..66e8d989a 100755
--- a/scripts/run-test.sh
+++ b/scripts/run-test.sh
@@ -36,8 +36,6 @@ start_testrpc
 echo "Starting our own geth instance"
 start_blockchain
 
-npm run truffle:migrate "$@"
-
 if [ "$SOLIDITY_COVERAGE" = true ]; then
   npm run truffle:coverage "$@"
 else
diff --git a/scripts/stake.js b/scripts/stake.js
index f2ae1f08b..1653def09 100644
--- a/scripts/stake.js
+++ b/scripts/stake.js
@@ -32,12 +32,10 @@ async function stake() {
   const maticToken = await RootToken.at(contracts.root.tokens.MaticToken)
   console.log({ stakeManager: stakeManager.address, maticToken: maticToken.address, stakeToken: await stakeManager.token() })
   console.log('Sender accounts has a balanceOf', (await maticToken.balanceOf(accounts[0])).toString())
-  maticToken.approve(stakeManager.address, web3.utils.toWei('1000000'))
-  await delay(5)
+  await maticToken.approve(stakeManager.address, web3.utils.toWei('1000000'))
   console.log('sent approve tx, staking now...')
   // Remember to change the 4th parameter to false if delegation is not required
-  stakeManager.stakeFor(validatorAccount, stakeAmount, heimdallFee, true, pubkey)
-  return delay(5)
+  await stakeManager.stakeFor(validatorAccount, stakeAmount, heimdallFee, true, pubkey)
 }
 
 async function topUpForFee() {