diff --git a/test/Bounty.js b/test/Bounty.js
index 19b43db4e..cd73a18c4 100644
--- a/test/Bounty.js
+++ b/test/Bounty.js
@@ -1,6 +1,7 @@
 contract('Bounty', function(accounts) {
   it("can create bounty contract with factory address", function(done){
     var target = SecureTargetMock.deployed();
+
     SimpleTokenBounty.new(target.address).
       then(function(bounty){
         return bounty.factoryAddress.call()
@@ -11,37 +12,45 @@ contract('Bounty', function(accounts) {
       then(done);
   })
 
-  it("can call checkInvariant for SecureTargetMock", function(done){
-    var bounty;
-    var targetFactory = SecureTargetFactory.deployed();
-    SimpleTokenBounty.new(targetFactory.address).
-      then(function(_bounty) {
-        bounty = _bounty;
-        return bounty.createTarget();
-      }).
-      then(function() {
-        return bounty.checkInvariant.call()
-      }).
-      then(function(result) {
-        assert.isTrue(result);
-      }).
-      then(done);
+  describe("SecureTargetMock", function(){
+    before(function(){
+      targetFactory = SecureTargetFactory.deployed();
+    })
+
+    it("checkInvariant returns true", function(done){
+      SimpleTokenBounty.new(targetFactory.address).
+        then(function(_bounty) {
+          bounty = _bounty;
+          return bounty.createTarget();
+        }).
+        then(function() {
+          return bounty.checkInvariant.call()
+        }).
+        then(function(result) {
+          assert.isTrue(result);
+        }).
+        then(done);
+    })
   })
 
-  it("can call checkInvariant for InsecureTargetMock", function(done){
-    var bounty;
-    var targetFactory = InsecureTargetFactory.deployed();
-    SimpleTokenBounty.new(targetFactory.address).
-      then(function(_bounty) {
-        bounty = _bounty;
-        return bounty.createTarget();
-      }).
-      then(function() {
-        return bounty.checkInvariant.call()
-      }).
-      then(function(result) {
-        assert.isFalse(result);
-      }).
-      then(done);
+  describe("InsecureTargetMock", function(){
+    before(function(){
+      targetFactory = InsecureTargetFactory.deployed();
+    })
+
+    it("checkInvariant returns false", function(done){
+      SimpleTokenBounty.new(targetFactory.address).
+        then(function(_bounty) {
+          bounty = _bounty;
+          return bounty.createTarget();
+        }).
+        then(function() {
+          return bounty.checkInvariant.call()
+        }).
+        then(function(result) {
+          assert.isFalse(result);
+        }).
+        then(done);
+    })
   })
 });