diff --git a/test/unittests/evmmax_execution_tests.cpp b/test/unittests/evmmax_execution_tests.cpp
index 45c8df731e..d810ab5de4 100644
--- a/test/unittests/evmmax_execution_tests.cpp
+++ b/test/unittests/evmmax_execution_tests.cpp
@@ -61,9 +61,9 @@ TEST_P(evm, evmmax_smoke_test_1byte_modulus)
     // Modulus ID
     code += setupx(3, 1, 0, 1);
     // value 3
-    code += mstore8(1, 0x03);
+    code += mstore8(8, 0x03);
     // value 6
-    code += mstore8(2, 0x06);
+    code += mstore8(16, 0x06);
     // num values
     // values offset
     // store values
@@ -75,15 +75,15 @@ TEST_P(evm, evmmax_smoke_test_1byte_modulus)
     // SUBMODX for values in slots 1 and 2 save result in slot 2
     code += submodx(2, 2, 1);
     // load values from slot 2 into EVM memory
-    code += loadx(1, 2, 3);
+    code += loadx(1, 2, 17);
     // return loaded result
-    code += ret(3, 1);
+    code += ret(17, 8);
 
     execute(1000, code);
     EXPECT_EQ(result.status_code, EVMC_SUCCESS);
 
-    ASSERT_EQ(result.output_size, 1);
-    EXPECT_EQ(hex({result.output_data, result.output_size}), hex(0x06));
+    ASSERT_EQ(result.output_size, 8);
+    EXPECT_EQ(hex({result.output_data, result.output_size}), "0000000000000006");
 }
 
 TEST_P(evm, evmmax_smoke_test_2byte_modulus)
@@ -101,11 +101,11 @@ TEST_P(evm, evmmax_smoke_test_2byte_modulus)
     // Modulus ID
     code += setupx(3, 2, 0, 1);
     // value 258
-    code += mstore8(2, 0x01);
-    code += mstore8(3, 0x02);
+    code += mstore8(8, 0x01);
+    code += mstore8(9, 0x02);
     // value 254
-    code += mstore8(4, 0x00);
-    code += mstore8(5, 0xfe);
+    code += mstore8(16, 0x00);
+    code += mstore8(17, 0xfe);
     // num values
     // values offset
     // store values
@@ -117,13 +117,13 @@ TEST_P(evm, evmmax_smoke_test_2byte_modulus)
     // SUBMODX for values in slots 1 and 2 save result in slot 2
     code += submodx(2, 2, 1);  // 126 - 254 = 135 mod 263
     // load values from slot 2 into EVM memory
-    code += loadx(1, 2, 6);
+    code += loadx(1, 2, 18);
     // return loaded result
-    code += ret(6, 2);
+    code += ret(18, 8);
 
     execute(1000, code);
     EXPECT_EQ(result.status_code, EVMC_SUCCESS);
 
-    ASSERT_EQ(result.output_size, 2);
-    EXPECT_EQ(hex({result.output_data, result.output_size}), "0087");
+    ASSERT_EQ(result.output_size, 8);
+    EXPECT_EQ(hex({result.output_data, result.output_size}), "0000000000000087");
 }