diff --git a/contracts/erc20/test/WETH9V06Test.t.sol b/contracts/erc20/test/WETH9V06Test.t.sol
index 4f7939ae22..30fe2883b7 100644
--- a/contracts/erc20/test/WETH9V06Test.t.sol
+++ b/contracts/erc20/test/WETH9V06Test.t.sol
@@ -39,7 +39,6 @@ contract WETH9V06Test is Test {
     function testShouldConvertDepositedETHToWrappedETH() public {
         vm.prank(user);
         etherToken.deposit{value: 1e20}();
-        vm.stopPrank();
 
         assertEq(etherToken.balanceOf(user), 1e20);
         assertEq(address(etherToken).balance, 1e20);
@@ -58,7 +57,6 @@ contract WETH9V06Test is Test {
         etherToken.deposit{value: 1e20}();
         vm.prank(user);
         etherToken.withdraw(100);
-        vm.stopPrank();
 
         assertEq(etherToken.balanceOf(user), 1e20 - 100);
         assertEq(address(etherToken).balance, 1e20 - 100);
@@ -68,7 +66,6 @@ contract WETH9V06Test is Test {
     function testShouldConvertSentETHToWrappedETH() public {
         vm.prank(user);
         address(etherToken).call{value: 1e20}(new bytes(0));
-        vm.stopPrank();
 
         assertEq(etherToken.balanceOf(user), 1e20);
         assertEq(address(etherToken).balance, 1e20);
diff --git a/contracts/erc20/test/ZRXTokenTest.t.sol b/contracts/erc20/test/ZRXTokenTest.t.sol
index 4a2ad56ec9..d0c42e4153 100644
--- a/contracts/erc20/test/ZRXTokenTest.t.sol
+++ b/contracts/erc20/test/ZRXTokenTest.t.sol
@@ -34,7 +34,6 @@ contract ZRXTokenTest is Test {
         assembly {
             _address := create(0, add(_bytecode, 0x20), mload(_bytecode))
         }
-        vm.stopPrank();
         zrxToken = IERC20Token(address(_address));
     }
 
@@ -73,7 +72,6 @@ contract ZRXTokenTest is Test {
     function testShouldReturnFalseIfSenderHasInsufficientBalance() public {
         vm.prank(owner);
         zrxToken.approve(user, totalSupply + 1);
-        vm.stopPrank();
 
         bool success = zrxToken.transferFrom(owner, user, totalSupply + 1);
         assertEq(success, false);
@@ -82,7 +80,6 @@ contract ZRXTokenTest is Test {
     function testShouldReturnFalseIfRecipientHasInsufficientAllowance() public {
         vm.prank(owner);
         zrxToken.approve(user, totalSupply - 1);
-        vm.stopPrank();
 
         bool success = zrxToken.transferFrom(owner, user, totalSupply);
         assertEq(success, false);
@@ -97,7 +94,6 @@ contract ZRXTokenTest is Test {
     function testShouldNotModifySenderAllowanceIfSetToUINT256Max() public {
         vm.prank(owner);
         zrxToken.approve(user, type(uint256).max);
-        vm.stopPrank();
 
         zrxToken.transferFrom(owner, user, 100);
         assertEq(zrxToken.allowance(owner, user), type(uint256).max);
@@ -106,7 +102,6 @@ contract ZRXTokenTest is Test {
     function testShouldTransferCorrectlyWhenSufficientAllowance() public {
         vm.prank(owner);
         zrxToken.approve(user, 1000 * 1e18);
-        vm.stopPrank();
 
         vm.prank(user);
         zrxToken.transferFrom(owner, user, 100 * 1e18);
diff --git a/contracts/governance/test/unit/ZeroExGovernorBaseTest.t.sol b/contracts/governance/test/unit/ZeroExGovernorBaseTest.t.sol
index 9c1c1957c3..23130b185d 100644
--- a/contracts/governance/test/unit/ZeroExGovernorBaseTest.t.sol
+++ b/contracts/governance/test/unit/ZeroExGovernorBaseTest.t.sol
@@ -90,7 +90,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -155,7 +154,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -266,7 +264,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -330,7 +327,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -366,7 +362,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -402,7 +397,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
@@ -438,7 +432,6 @@ abstract contract ZeroExGovernorBaseTest is BaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
diff --git a/contracts/governance/test/unit/ZeroExProtocolGovernor.t.sol b/contracts/governance/test/unit/ZeroExProtocolGovernor.t.sol
index b554e1c418..7924d949a8 100644
--- a/contracts/governance/test/unit/ZeroExProtocolGovernor.t.sol
+++ b/contracts/governance/test/unit/ZeroExProtocolGovernor.t.sol
@@ -70,13 +70,12 @@ contract ZeroExProtocolGovernorTest is ZeroExGovernorBaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
+
         vm.prank(account3);
         governor.castVote(proposalId, 0); // Vote "against"
-        vm.stopPrank();
+
         vm.prank(account4);
         governor.castVote(proposalId, 2); // Vote "abstain"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);
diff --git a/contracts/governance/test/unit/ZeroExTreasuryGovernor.t.sol b/contracts/governance/test/unit/ZeroExTreasuryGovernor.t.sol
index 45a2a1c5a8..810c6ce1d5 100644
--- a/contracts/governance/test/unit/ZeroExTreasuryGovernor.t.sol
+++ b/contracts/governance/test/unit/ZeroExTreasuryGovernor.t.sol
@@ -66,13 +66,12 @@ contract ZeroExTreasuryGovernorTest is ZeroExGovernorBaseTest {
         // Vote
         vm.prank(account2);
         governor.castVote(proposalId, 1); // Vote "for"
-        vm.stopPrank();
+
         vm.prank(account3);
         governor.castVote(proposalId, 0); // Vote "against"
-        vm.stopPrank();
+
         vm.prank(account4);
         governor.castVote(proposalId, 2); // Vote "abstain"
-        vm.stopPrank();
 
         // Fast forward to vote end
         vm.roll(governor.proposalDeadline(proposalId) + 1);