diff --git a/contracts/exchange/test/core.ts b/contracts/exchange/test/core.ts
index a06b1e8907..817f68f5e1 100644
--- a/contracts/exchange/test/core.ts
+++ b/contracts/exchange/test/core.ts
@@ -618,12 +618,7 @@ blockchainTests.resets('Exchange core', () => {
                     salt: new BigNumber(3),
                 }),
             ];
-            await exchangeWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress, {
-                // HACK(albrow): We need to hardcode the gas estimate here because
-                // the Geth gas estimator doesn't work with the way we use
-                // delegatecall and swallow errors.
-                gas: 600000,
-            });
+            await exchangeWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress);
 
             const newBalances = await erc20Wrapper.getBalancesAsync();
             const fillMakerAssetAmount = signedOrders[2].makerAssetAmount.plus(signedOrders[3].makerAssetAmount);
diff --git a/contracts/exchange/test/wrapper.ts b/contracts/exchange/test/wrapper.ts
index 659ce8f234..7d49408335 100644
--- a/contracts/exchange/test/wrapper.ts
+++ b/contracts/exchange/test/wrapper.ts
@@ -223,10 +223,6 @@ blockchainTests.resets('Exchange wrappers', env => {
             );
             await exchangeWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress, {
                 takerAssetFillAmount,
-                // HACK(albrow): We need to hardcode the gas estimate here because
-                // the Geth gas estimator doesn't work with the way we use
-                // delegatecall and swallow errors.
-                gas: 250000,
             });
             const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -450,10 +446,6 @@ blockchainTests.resets('Exchange wrappers', env => {
             );
             await exchangeWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress, {
                 takerAssetFillAmount,
-                // HACK(albrow): We need to hardcode the gas estimate here because
-                // the Geth gas estimator doesn't work with the way we use
-                // delegatecall and swallow errors.
-                gas: 280000,
             });
 
             // Verify post-conditions
@@ -688,10 +680,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress, {
                     takerAssetFillAmounts,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -763,10 +751,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.batchFillOrdersNoThrowAsync(newOrders, takerAddress, {
                     takerAssetFillAmounts,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 450000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -789,10 +773,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
                     takerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 6000000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -864,10 +844,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
                     takerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -938,10 +914,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
                     takerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -985,10 +957,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.marketBuyOrdersNoThrowAsync(signedOrders, takerAddress, {
                     makerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -1060,10 +1028,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.marketBuyOrdersNoThrowAsync(signedOrders, takerAddress, {
                     makerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
@@ -1135,10 +1099,6 @@ blockchainTests.resets('Exchange wrappers', env => {
                 );
                 await exchangeWrapper.marketBuyOrdersNoThrowAsync(signedOrders, takerAddress, {
                     makerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 });
                 const newBalances = await erc20Wrapper.getBalancesAsync();
 
diff --git a/contracts/extensions/test/balance_threshold_filter.ts b/contracts/extensions/test/balance_threshold_filter.ts
index 238f860418..fc37812c26 100644
--- a/contracts/extensions/test/balance_threshold_filter.ts
+++ b/contracts/extensions/test/balance_threshold_filter.ts
@@ -427,10 +427,6 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 validTakerAddress,
                 {
                     takerAssetFillAmounts,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 },
             );
             // Assert validated addresses
@@ -699,10 +695,6 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 validTakerAddress,
                 {
                     takerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 },
             );
             // Assert validated addresses
@@ -951,10 +943,6 @@ describe(ContractName.BalanceThresholdFilter, () => {
                 validTakerAddress,
                 {
                     takerAssetFillAmount: cumulativeTakerAssetFillAmount,
-                    // HACK(albrow): We need to hardcode the gas estimate here because
-                    // the Geth gas estimator doesn't work with the way we use
-                    // delegatecall and swallow errors.
-                    gas: 600000,
                 },
             );
             // Assert validated addresses