diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt
index ffb68ce4a0..bed9547dd6 100644
--- a/test/unittests/CMakeLists.txt
+++ b/test/unittests/CMakeLists.txt
@@ -13,6 +13,7 @@ add_executable(evmone-unittests
     evm_fixture.hpp
     evm_test.cpp
     evm_calls_test.cpp
+    evm_eip2929_test.cpp
     evm_state_test.cpp
     evm_other_test.cpp
     evmone_test.cpp
diff --git a/test/unittests/evm_eip2929_test.cpp b/test/unittests/evm_eip2929_test.cpp
new file mode 100644
index 0000000000..ad0eb39807
--- /dev/null
+++ b/test/unittests/evm_eip2929_test.cpp
@@ -0,0 +1,207 @@
+// evmone: Fast Ethereum Virtual Machine implementation
+// Copyright 2021 The evmone Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+/// This file contains EVM unit tests for EIP-2929 "Gas cost increases for state access opcodes"
+/// https://eips.ethereum.org/EIPS/eip-2929
+
+#include "evm_fixture.hpp"
+
+using namespace evmc::literals;
+using evmone::test::evm;
+
+TEST_P(evm, eip2929_case1)
+{
+    // https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-1
+    rev = EVMC_BERLIN;
+    msg.sender = 0x0000000000000000000000000000000000000000_address;
+    msg.destination = 0x000000000000000000000000636F6E7472616374_address;
+    const auto code =
+        "0x60013f5060023b506003315060f13f5060f23b5060f3315060f23f5060f33b5060f1315032315030315000";
+
+    execute(code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 8653);
+    EXPECT_EQ(result.output_size, 0);
+
+    const auto& r = host.recorded_account_accesses;
+    ASSERT_EQ(r.size(), 24);
+    EXPECT_EQ(r[0], msg.sender);
+    EXPECT_EQ(r[1], msg.destination);
+    EXPECT_EQ(r[2], 0x0000000000000000000000000000000000000001_address);
+    EXPECT_EQ(r[3], 0x0000000000000000000000000000000000000001_address);
+    EXPECT_EQ(r[4], 0x0000000000000000000000000000000000000002_address);
+    EXPECT_EQ(r[5], 0x0000000000000000000000000000000000000002_address);
+    EXPECT_EQ(r[6], 0x0000000000000000000000000000000000000003_address);
+    EXPECT_EQ(r[7], 0x0000000000000000000000000000000000000003_address);
+    EXPECT_EQ(r[8], 0x00000000000000000000000000000000000000f1_address);
+    EXPECT_EQ(r[9], 0x00000000000000000000000000000000000000f1_address);
+    EXPECT_EQ(r[10], 0x00000000000000000000000000000000000000f2_address);
+    EXPECT_EQ(r[11], 0x00000000000000000000000000000000000000f2_address);
+    EXPECT_EQ(r[12], 0x00000000000000000000000000000000000000f3_address);
+    EXPECT_EQ(r[13], 0x00000000000000000000000000000000000000f3_address);
+    EXPECT_EQ(r[14], 0x00000000000000000000000000000000000000f2_address);
+    EXPECT_EQ(r[15], 0x00000000000000000000000000000000000000f2_address);
+    EXPECT_EQ(r[16], 0x00000000000000000000000000000000000000f3_address);
+    EXPECT_EQ(r[17], 0x00000000000000000000000000000000000000f3_address);
+    EXPECT_EQ(r[18], 0x00000000000000000000000000000000000000f1_address);
+    EXPECT_EQ(r[19], 0x00000000000000000000000000000000000000f1_address);
+    EXPECT_EQ(r[20], 0x0000000000000000000000000000000000000000_address);
+    EXPECT_EQ(r[21], 0x0000000000000000000000000000000000000000_address);
+    EXPECT_EQ(r[22], msg.destination);
+    EXPECT_EQ(r[23], msg.destination);
+}
+
+TEST_P(evm, eip2929_case2)
+{
+    // https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-2
+    rev = EVMC_BERLIN;
+    msg.sender = 0x0000000000000000000000000000000000000000_address;
+    msg.destination = 0x000000000000000000000000636F6E7472616374_address;
+    const auto code = "0x60006000600060ff3c60006000600060ff3c600060006000303c00";
+
+    execute(code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 2835);
+    EXPECT_EQ(result.output_size, 0);
+
+    const auto& r = host.recorded_account_accesses;
+    ASSERT_EQ(r.size(), 8);
+    EXPECT_EQ(r[0], msg.sender);
+    EXPECT_EQ(r[1], msg.destination);
+    EXPECT_EQ(r[2], 0x00000000000000000000000000000000000000ff_address);
+    EXPECT_EQ(r[3], 0x00000000000000000000000000000000000000ff_address);
+    EXPECT_EQ(r[4], 0x00000000000000000000000000000000000000ff_address);
+    EXPECT_EQ(r[5], 0x00000000000000000000000000000000000000ff_address);
+    EXPECT_EQ(r[6], msg.destination);
+    EXPECT_EQ(r[7], msg.destination);
+}
+
+TEST_P(evm, eip2929_case3)
+{
+    // https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-3
+    rev = EVMC_BERLIN;
+    msg.sender = 0x0000000000000000000000000000000000000000_address;
+    msg.destination = 0x000000000000000000000000636F6E7472616374_address;
+    const auto code = "0x60015450601160015560116002556011600255600254600154";
+
+    execute(code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 44529);
+    EXPECT_EQ(result.output_size, 0);
+}
+
+TEST_P(evm, eip2929_case4)
+{
+    // https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-4
+    rev = EVMC_BERLIN;
+    msg.sender = 0x0000000000000000000000000000000000000000_address;
+    msg.destination = 0x000000000000000000000000636F6E7472616374_address;
+    const auto code = "0x60008080808060046000f15060008080808060ff6000f15060008080808060ff6000fa50";
+
+    execute(code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 2869);
+    EXPECT_EQ(result.output_size, 0);
+}
+
+TEST_P(evm, eip2929_balance_oog)
+{
+    rev = EVMC_BERLIN;
+    const auto code = push(0x0a) + OP_BALANCE;
+
+    execute(2603, code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 2603);
+
+    host.recorded_account_accesses.clear();
+    execute(2602, code);
+    EXPECT_GAS_USED(EVMC_OUT_OF_GAS, 2602);
+}
+
+TEST_P(evm, eip2929_extcodesize_oog)
+{
+    rev = EVMC_BERLIN;
+    const auto code = push(0x0a) + OP_EXTCODESIZE;
+
+    execute(2603, code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 2603);
+
+    host.recorded_account_accesses.clear();
+    execute(2602, code);
+    EXPECT_GAS_USED(EVMC_OUT_OF_GAS, 2602);
+}
+
+TEST_P(evm, eip2929_extcodecopy_oog)
+{
+    rev = EVMC_BERLIN;
+    const auto code = push(0) + OP_DUP1 + OP_DUP1 + push(0x0a) + OP_EXTCODECOPY;
+
+    execute(2612, code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 2612);
+
+    host.recorded_account_accesses.clear();
+    execute(2611, code);
+    EXPECT_GAS_USED(EVMC_OUT_OF_GAS, 2611);
+}
+
+TEST_P(evm, eip2929_extcodehash_oog)
+{
+    rev = EVMC_BERLIN;
+    const auto code = push(0x0a) + OP_EXTCODEHASH;
+
+    execute(2603, code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 2603);
+
+    host.recorded_account_accesses.clear();
+    execute(2602, code);
+    EXPECT_GAS_USED(EVMC_OUT_OF_GAS, 2602);
+}
+
+TEST_P(evm, eip2929_sload_cold)
+{
+    rev = EVMC_BERLIN;
+    const auto code = push(1) + OP_SLOAD;
+
+    const evmc::bytes32 key{1};
+    host.accounts[msg.destination].storage[key] = evmc::bytes32{2};
+    ASSERT_EQ(host.accounts[msg.destination].storage[key].access_status, EVMC_ACCESS_COLD);
+    execute(2103, code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 2103);
+    EXPECT_EQ(host.accounts[msg.destination].storage[key].access_status, EVMC_ACCESS_WARM);
+
+    host.accounts[msg.destination].storage[key].access_status = EVMC_ACCESS_COLD;
+    execute(2102, code);
+    EXPECT_GAS_USED(EVMC_OUT_OF_GAS, 2102);
+}
+
+TEST_P(evm, eip2929_sload_warm)
+{
+    rev = EVMC_BERLIN;
+    const auto code = push(1) + OP_SLOAD;
+
+    const evmc::bytes32 key{1};
+    host.accounts[msg.destination].storage[key] = {evmc::bytes32{2}, EVMC_ACCESS_WARM};
+    ASSERT_EQ(host.accounts[msg.destination].storage[key].access_status, EVMC_ACCESS_WARM);
+    execute(103, code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 103);
+    EXPECT_EQ(host.accounts[msg.destination].storage[key].access_status, EVMC_ACCESS_WARM);
+
+    execute(102, code);
+    EXPECT_GAS_USED(EVMC_OUT_OF_GAS, 102);
+}
+
+TEST_P(evm, eip2929_sstore_modify_cold)
+{
+    rev = EVMC_BERLIN;
+    const auto code = sstore(1, 3);
+
+    const evmc::bytes32 key{1};
+    host.accounts[msg.destination].storage[key] = evmc::bytes32{2};
+    execute(5006, code);
+    EXPECT_GAS_USED(EVMC_SUCCESS, 5006);
+    EXPECT_EQ(host.accounts[msg.destination].storage[key].value, evmc::bytes32{3});
+    EXPECT_EQ(host.accounts[msg.destination].storage[key].access_status, EVMC_ACCESS_WARM);
+
+    host.accounts[msg.destination].storage[key] = evmc::bytes32{2};
+    execute(5005, code);
+    EXPECT_GAS_USED(EVMC_OUT_OF_GAS, 5005);
+    // The storage will be modified anyway, because the cost is checked after.
+    EXPECT_EQ(host.accounts[msg.destination].storage[key].value, evmc::bytes32{3});
+    EXPECT_EQ(host.accounts[msg.destination].storage[key].access_status, EVMC_ACCESS_WARM);
+}
diff --git a/test/unittests/evm_fixture.hpp b/test/unittests/evm_fixture.hpp
index 7c86e7e993..919158d017 100644
--- a/test/unittests/evm_fixture.hpp
+++ b/test/unittests/evm_fixture.hpp
@@ -72,6 +72,12 @@ class evm : public testing::TestWithParam<evmc::VM*>
         msg.input_size = input.size();
         msg.gas = gas;
 
+        if (rev >= EVMC_BERLIN)  // Add EIP-2929 tweak.
+        {
+            host.access_account(msg.sender);
+            host.access_account(msg.destination);
+        }
+
         result = vm.execute(host, rev, msg, code.data(), code.size());
         output = {result.output_data, result.output_size};
         gas_used = msg.gas - result.gas_left;