diff --git a/test/solidity/contracts/intLocal.js b/test/solidity/contracts/intLocal.js
index fcf60bf4e9..5fab1e92b3 100644
--- a/test/solidity/contracts/intLocal.js
+++ b/test/solidity/contracts/intLocal.js
@@ -2,26 +2,33 @@
 
 module.exports = {
   contract: `
- contract intLocal {
+ contract proxy {
+    struct testStruct {
+        int one;
+        uint two;
+    }
+}
+contract intLocal {
     function intLocal () {
-    uint8 ui8 = 130;
-    uint16 ui16 = 456;
-    uint32 ui32 = 4356;
-    uint64 ui64 = 3543543543;
-    uint128 ui128 = 234567;
-    uint256 ui256 = 115792089237316195423570985008687907853269984665640564039457584007880697216513;
-    uint ui = 123545666;
-    int8 i8 = -45;
-    int16 i16 = -1234;
-    int32 i32 = 3455;
-    int64 i64 = -35566;
-    int128 i128 = -444444;
-    int256 i256 = 3434343;
-    int i = -32432423423;    
-    int32 ishrink = 2;   
-    level11();
-    level12();
-    level11();
+      proxy.testStruct memory p;
+      uint8 ui8 = 130;
+      uint16 ui16 = 456;
+      uint32 ui32 = 4356;
+      uint64 ui64 = 3543543543;
+      uint128 ui128 = 234567;
+      uint256 ui256 = 115792089237316195423570985008687907853269984665640564039457584007880697216513;
+      uint ui = 123545666;
+      int8 i8 = -45;
+      int16 i16 = -1234;
+      int32 i32 = 3455;
+      int64 i64 = -35566;
+      int128 i128 = -444444;
+      int256 i256 = 3434343;
+      int i = -32432423423;    
+      int32 ishrink = 2;   
+      level11();
+      level12();
+      level11();
     }
     
     function level11() {
diff --git a/test/solidity/localDecoder.js b/test/solidity/localDecoder.js
index 6bce8df528..b5d87f62d8 100644
--- a/test/solidity/localDecoder.js
+++ b/test/solidity/localDecoder.js
@@ -41,11 +41,11 @@ tape('solidity', function (t) {
             var callTree = new InternalCallTree(debuggerEvent, traceManager, solidityProxy, codeManager, { includeLocalsVariables: true })
             callTree.event.register('callTreeReady', (scopes, scopeStarts) => {
               st.equals(scopeStarts[0], '')
-              st.equals(scopeStarts[77], '1')
-              st.equals(scopeStarts[92], '1.1')
-              st.equals(scopeStarts[115], '2')
-              st.equals(scopeStarts[134], '3')
-              st.equals(scopeStarts[149], '3.1')
+              st.equals(scopeStarts[97], '1')
+              st.equals(scopeStarts[112], '1.1')
+              st.equals(scopeStarts[135], '2')
+              st.equals(scopeStarts[154], '3')
+              st.equals(scopeStarts[169], '3.1')
               st.equals(scopes[''].locals['ui8'].type.typeName, 'uint')
               st.equals(scopes[''].locals['ui16'].type.typeName, 'uint')
               st.equals(scopes[''].locals['ui32'].type.typeName, 'uint')
@@ -67,13 +67,14 @@ tape('solidity', function (t) {
               st.equals(scopes['3'].locals['ui8'].type.typeName, 'uint')
               st.equals(scopes['3.1'].locals['ui81'].type.typeName, 'uint')
 
-              decodeLocal(st, 105, traceManager, callTree, function (locals) {
-                st.equals(Object.keys(locals).length, 15)
+              decodeLocal(st, 125, traceManager, callTree, function (locals) {
+                st.equals(Object.keys(locals).length, 16)
               })
 
-              decodeLocal(st, 157, traceManager, callTree, function (locals) {
+              decodeLocal(st, 177, traceManager, callTree, function (locals) {
                 try {
                   st.equals(locals['ui8'], '')
+                  st.equals(Object.keys(locals).length, 1)
                 } catch (e) {
                   st.fail(e.message)
                 }