diff --git a/test/solidity/localsTests/int.js b/test/solidity/localsTests/int.js
index 797f306630..011aa2f6fc 100644
--- a/test/solidity/localsTests/int.js
+++ b/test/solidity/localsTests/int.js
@@ -32,12 +32,12 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
           callTree.event.register('callTreeReady', (scopes, scopeStarts) => {
             try {
               st.equals(scopeStarts[0], '')
-              st.equals(scopeStarts[12], '1')
-              st.equals(scopeStarts[104], '2')
-              st.equals(scopeStarts[119], '2.1')
-              st.equals(scopeStarts[142], '3')
-              st.equals(scopeStarts[161], '4')
-              st.equals(scopeStarts[176], '4.1')
+              st.equals(scopeStarts[11], '1')
+              st.equals(scopeStarts[103], '2')
+              st.equals(scopeStarts[118], '2.1')
+              st.equals(scopeStarts[139], '3')
+              st.equals(scopeStarts[157], '4')
+              st.equals(scopeStarts[172], '4.1')
               st.equals(scopes[''].locals['ui8'].type.typeName, 'uint8')
               st.equals(scopes[''].locals['ui16'].type.typeName, 'uint16')
               st.equals(scopes[''].locals['ui32'].type.typeName, 'uint32')
@@ -81,7 +81,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
               st.equals(locals['ishrink'].value, '2')
             })
 
-            helper.decodeLocals(st, 175, traceManager, callTree, function (locals) {
+            helper.decodeLocals(st, 171, traceManager, callTree, function (locals) {
               try {
                 st.equals(locals['ui8'].value, '123')
                 st.equals(Object.keys(locals).length, 1)
diff --git a/test/solidity/localsTests/structArray.js b/test/solidity/localsTests/structArray.js
index 8d733ebd21..0adfafa078 100644
--- a/test/solidity/localsTests/structArray.js
+++ b/test/solidity/localsTests/structArray.js
@@ -30,7 +30,7 @@ module.exports = function (st, vm, privateKey, contractBytecode, compilationResu
             st.fail(error)
           })
           callTree.event.register('callTreeReady', (scopes, scopeStarts) => {
-            helper.decodeLocals(st, 2094, traceManager, callTree, function (locals) {
+            helper.decodeLocals(st, 2089, traceManager, callTree, function (locals) {
               try {
                 st.equals(locals['bytesSimple'].length, '0x14')
                 st.equals(locals['bytesSimple'].value, '0x746573745f7375706572')