diff --git a/crates/interpreter/src/gas.rs b/crates/interpreter/src/gas.rs
index 01a3ebeafe..1407ae7bc6 100644
--- a/crates/interpreter/src/gas.rs
+++ b/crates/interpreter/src/gas.rs
@@ -72,6 +72,11 @@ impl Gas {
         self.remaining
     }
 
+    /// Return remaining gas after subtracting 63/64 parts.
+    pub const fn remaining_63_of_64_parts(&self) -> u64 {
+        self.remaining - self.remaining / 64
+    }
+
     /// Erases a gas cost from the totals.
     #[inline]
     pub fn erase_cost(&mut self, returned: u64) {
diff --git a/crates/interpreter/src/instructions/contract.rs b/crates/interpreter/src/instructions/contract.rs
index f57a786962..aac3d38f76 100644
--- a/crates/interpreter/src/instructions/contract.rs
+++ b/crates/interpreter/src/instructions/contract.rs
@@ -62,10 +62,8 @@ pub fn eofcreate<H: Host + ?Sized>(interpreter: &mut Interpreter, _host: &mut H)
         .target_address
         .create2(salt.to_be_bytes(), keccak256(sub_container));
 
-    let gas_reduce = max(interpreter.gas.remaining() / 64, 5000);
-    let gas_limit = interpreter.gas().remaining().saturating_sub(gas_reduce);
+    let gas_limit = interpreter.gas().remaining_63_of_64_parts();
     gas!(interpreter, gas_limit);
-
     // Send container for execution container is preverified.
     interpreter.instruction_result = InstructionResult::CallOrCreate;
     interpreter.next_action = InterpreterAction::EOFCreate {
diff --git a/crates/interpreter/src/instructions/contract/call_helpers.rs b/crates/interpreter/src/instructions/contract/call_helpers.rs
index f9acc74901..77fa16d6d3 100644
--- a/crates/interpreter/src/instructions/contract/call_helpers.rs
+++ b/crates/interpreter/src/instructions/contract/call_helpers.rs
@@ -55,9 +55,11 @@ pub fn calc_call_gas<SPEC: Spec>(
 
     // EIP-150: Gas cost changes for IO-heavy operations
     let gas_limit = if SPEC::enabled(TANGERINE) {
-        let gas = interpreter.gas().remaining();
         // take l64 part of gas_limit
-        min(gas - gas / 64, local_gas_limit)
+        min(
+            interpreter.gas().remaining_63_of_64_parts(),
+            local_gas_limit,
+        )
     } else {
         local_gas_limit
     };
diff --git a/crates/revm/src/context/inner_evm_context.rs b/crates/revm/src/context/inner_evm_context.rs
index 200345dc77..c83d5ec14a 100644
--- a/crates/revm/src/context/inner_evm_context.rs
+++ b/crates/revm/src/context/inner_evm_context.rs
@@ -334,6 +334,14 @@ impl<DB: Database> InnerEvmContext<DB> {
             return;
         }
 
+        // deduct gas for code deployment.
+        let gas_for_code = interpreter_result.output.len() as u64 * gas::CODEDEPOSIT;
+        if !interpreter_result.gas.record_cost(gas_for_code) {
+            self.journaled_state.checkpoint_revert(journal_checkpoint);
+            interpreter_result.result = InstructionResult::OutOfGas;
+            return;
+        }
+
         // commit changes reduces depth by -1.
         self.journaled_state.checkpoint_commit();