diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
index 08c44f2abac..82611a6f3d5 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
@@ -217,7 +217,8 @@ internal class FunctionInlining(val context: Context): IrElementTransformerVoid(
             val newDeclaration = super.visitVariable(declaration) as IrVariable             // Process variable initializer.
             val newVariable    = newVariable(newDeclaration)                                // Create new local variable.
             val getVal         = IrGetValueImpl(0, 0, newVariable.descriptor)               // Create new IR element representing access the new variable.
-            substituteMap[declaration.descriptor.original] to getVal
+            val descriptor     = declaration.descriptor.original as ValueDescriptor
+            substituteMap[descriptor] = getVal
             return newVariable
         }
     }
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index ac24fa906f8..fe8973014f2 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -1382,21 +1382,6 @@ task inline0(type: RunKonanTest) {
     source = "codegen/inline/inline0.kt"
 }
 
-task inline1(type: RunKonanTest) {
-    goldValue = "Hello world\n"
-    source = "codegen/inline/inline1.kt"
-}
-
-task inline2(type: RunKonanTest) {
-    goldValue = "hello 1 8\n"
-    source = "codegen/inline/inline2.kt"
-}
-
-task inline3(type: RunKonanTest) {
-    goldValue = "5\n"
-    source = "codegen/inline/inline3.kt"
-}
-
 task vararg0(type: RunKonanTest) {
     source = "lower/vararg.kt"
 }
@@ -1419,6 +1404,21 @@ task tailrec(type: RunKonanTest) {
     source = "lower/tailrec.kt"
 }
 
+task inline1(type: RunKonanTest) {
+    goldValue = "Hello world\n"
+    source = "codegen/inline/inline1.kt"
+}
+
+task inline2(type: RunKonanTest) {
+    goldValue = "hello 1 8\n"
+    source = "codegen/inline/inline2.kt"
+}
+
+task inline3(type: RunKonanTest) {
+    goldValue = "5\n"
+    source = "codegen/inline/inline3.kt"
+}
+
 task inline4(type: RunKonanTest) {
     goldValue = "3\n"
     source = "codegen/inline/inline4.kt"
@@ -1470,7 +1470,6 @@ task inline15(type: RunKonanTest) {
 }
 
 task inline16(type: RunKonanTest) {
-    disabled = true
     goldValue = "false\n"
     source = "codegen/inline/inline16.kt"
 }
@@ -1481,19 +1480,16 @@ task inline17(type: RunKonanTest) {
 }
 
 task inline18(type: RunKonanTest) {
-    disabled = true
     goldValue = "true\n"
     source = "codegen/inline/inline18.kt"
 }
 
 task inline19(type: RunKonanTest) {
-    disabled = true
     goldValue = "6\n"
     source = "codegen/inline/inline19.kt"
 }
 
 task inline20(type: RunKonanTest) {
-    disabled = true
     goldValue = "def\n"
     source = "codegen/inline/inline20.kt"
 }