3 files changed, 4 insertions, 8 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 0db4be830..e9182dd1b 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -54,9 +54,7 @@ describe('Exchange', () => {
     before(async () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
         maker = accounts[0];
-        tokenOwner = accounts[0];
-        taker = accounts[1] || accounts[accounts.length - 1];
-        feeRecipient = accounts[2] || accounts[accounts.length - 1];
+        [tokenOwner, taker, feeRecipient] = accounts;
         [rep, dgd, zrx] = await Promise.all([
             deployer.deployAsync(ContractName.DummyToken),
             deployer.deployAsync(ContractName.DummyToken),
diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts
index 047ab899a..5efce41a4 100644
--- a/packages/contracts/test/exchange/helpers.ts
+++ b/packages/contracts/test/exchange/helpers.ts
@@ -30,8 +30,7 @@ describe('Exchange', () => {
 
     before(async () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        maker = accounts[0];
-        feeRecipient = accounts[1] || accounts[accounts.length - 1];
+        [maker, feeRecipient] = accounts;
         const tokenRegistry = await deployer.deployAsync(ContractName.TokenRegistry);
         const tokenTransferProxy = await deployer.deployAsync(ContractName.TokenTransferProxy);
         const [rep, dgd, zrx] = await Promise.all([
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index 43cb622ac..acdf481a9 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -45,9 +45,8 @@ describe('Exchange', () => {
 
     before(async () => {
         const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        tokenOwner = maker = accounts[0];
-        taker = accounts[1] || accounts[accounts.length - 1];
-        feeRecipient = accounts[2] || accounts[accounts.length - 1];
+        tokenOwner = accounts[0];
+        [maker, taker, feeRecipient] = accounts;
         [rep, dgd, zrx] = await Promise.all([
             deployer.deployAsync(ContractName.DummyToken),
             deployer.deployAsync(ContractName.DummyToken),