diff --git a/test/Bounty.js b/test/Bounty.js
index 191179c42..286845036 100644
--- a/test/Bounty.js
+++ b/test/Bounty.js
@@ -52,7 +52,7 @@ contract('Bounty', function(accounts) {
       let bounty = await SecureTargetBounty.new();
       let event = bounty.TargetCreated({});
 
-      event.watch(async function(err, result) {
+      let watcher = async function(err, result) {
         event.stopWatching();
         if (err) { throw err; }
 
@@ -66,8 +66,8 @@ contract('Bounty', function(accounts) {
           await bounty.claim(targetAddress, {from:researcher});
           assert.isTrue(false); // should never reach here
         } catch(error) {
-            let reClaimedBounty = await bounty.claimed.call();
-            assert.isFalse(reClaimedBounty);
+          let reClaimedBounty = await bounty.claimed.call();
+          assert.isFalse(reClaimedBounty);
 
         }
         try {
@@ -77,8 +77,9 @@ contract('Bounty', function(accounts) {
           assert.equal(reward,
             web3.eth.getBalance(bounty.address).toNumber());
         }
-      });
+      };
       bounty.createTarget({from:researcher});
+      await awaitEvent(event, watcher);
     });
   });