diff --git a/eth_tester/backends/pyevm/main.py b/eth_tester/backends/pyevm/main.py
index fe9a8b87..0e0de43f 100644
--- a/eth_tester/backends/pyevm/main.py
+++ b/eth_tester/backends/pyevm/main.py
@@ -464,7 +464,7 @@ def _max_available_gas(self):
 
     @replace_exceptions({
         EVMInvalidInstruction: TransactionFailed,
-        EVMRevert: TransactionFailed})
+    })
     def estimate_gas(self, transaction):
         evm_transaction = self._get_normalized_and_unsigned_evm_transaction(assoc(
             transaction, 'gas', 21000))
diff --git a/eth_tester/utils/backend_testing.py b/eth_tester/utils/backend_testing.py
index fc200457..a64a6846 100644
--- a/eth_tester/utils/backend_testing.py
+++ b/eth_tester/utils/backend_testing.py
@@ -719,7 +719,7 @@ def test_can_estimate_gas_after_exception_raised_estimating_gas(self, eth_tester
             'throw_contract',
             'willThrow',
         )
-        with pytest.raises(TransactionFailed):
+        with pytest.raises(EVMRevert):
             eth_tester.estimate_gas(dissoc(call_will_throw_transaction, 'gas'))
 
         call_set_value_transaction = _make_call_throws_transaction(