diff --git a/tests/libs/zbxpreproc/zbx_item_preproc.yaml b/tests/libs/zbxpreproc/zbx_item_preproc.yaml
index c48523395d7..d8b5347c99a 100644
--- a/tests/libs/zbxpreproc/zbx_item_preproc.yaml
+++ b/tests/libs/zbxpreproc/zbx_item_preproc.yaml
@@ -259,7 +259,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: 
+    data:
   step:
     type: ZBX_PREPROC_REGSUB
     params: "([0-9]+)\n\\1"
@@ -922,7 +922,7 @@ in:
     data: abc
   step:
     type: ZBX_PREPROC_JSONPATH
-    params: 
+    params:
 out:
   return: FAIL
 ---
@@ -934,7 +934,7 @@ in:
     data: abc
   step:
     type: ZBX_PREPROC_JSONPATH
-    params: 
+    params:
 out:
   return: FAIL
 ---
@@ -976,6 +976,7 @@ in:
     params: $.abc
 out:
   return: FAIL
+---
 test case: jsonpath3_json
 in:
   value:
@@ -994,7 +995,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1009,7 +1010,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1024,7 +1025,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1033,12 +1034,13 @@ out:
   return: SUCCEED
   value: |-
     [1,2,3]
+---
 test case: jsonpath5_json
 in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1053,7 +1055,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1067,7 +1069,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1081,7 +1083,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b c":["one", "two", "three"]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1095,7 +1097,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b c":["one", "two", "three"]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1109,7 +1111,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b c":["one", "two \"2\"", 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1123,7 +1125,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b c":["one", "two \"2\"", 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1137,7 +1139,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b c":["one", "two \"2\"", 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1151,7 +1153,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b c":["one", "two \"2\"", 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1165,7 +1167,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1178,7 +1180,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1191,7 +1193,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1204,7 +1206,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1217,20 +1219,20 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
     params: $.a['b][3]
 out:
   return: FAIL
----    
+---
 test case: jsonpath12_json
 in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"b":[1, 2, 3]}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1243,7 +1245,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"\ud800": 1}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1256,7 +1258,7 @@ in:
   value:
     value_type: ITEM_VALUE_TYPE_JSON
     time: 2017-10-29 03:15:00 +03:00
-    data: |- 
+    data: |-
       {"a":{"\ud800": 1}}
   step:
     type: ZBX_PREPROC_JSONPATH
@@ -1565,7 +1567,7 @@ in:
     data: error:123
   step:
     type: ZBX_PREPROC_ERROR_FIELD_REGEX
-    params: |- 
+    params: |-
       error:([0-9]+)
       \1
 out:
@@ -1580,7 +1582,7 @@ in:
     data: value:123
   step:
     type: ZBX_PREPROC_ERROR_FIELD_REGEX
-    params: |- 
+    params: |-
       error:([0-9]+)
       \1
 out:
@@ -1831,7 +1833,7 @@ out:
   return: SUCCEED
   value: 225000000000000000000
 ---
-test case: prometheus_getmetric1 
+test case: prometheus_getmetric1
 in:
   value:
     value_type: ITEM_VALUE_TYPE_STR
@@ -2583,7 +2585,7 @@ in:
     data: |
       .1.3.6.1.1 = Hex-STRING: 71 71 
       AA BB CC 
-      DD 
+      DD
   step:
     type: ZBX_PREPROC_SNMP_WALK_VALUE
     params: |-
@@ -4798,20 +4800,20 @@ out:
   return: SUCCEED
   value: '"b"'
 ---
-  test case: SNMP walk to value - duplicate oids
-  in:
-    value:
-      value_type: ITEM_VALUE_TYPE_STR
-      time: 2017-10-29 03:15:00 +03:00
-      data: |
-        .1.3.6.1.1 = STRING: "AAA"
-        .1.3.6.1.1 = STRING: "AAA"
-    step:
-      type: ZBX_PREPROC_SNMP_WALK_VALUE
-      params: |-
-        .1.3.6.1.1
-        0
-  out:
-    return: SUCCEED
-    value: "AAA"
+test case: SNMP walk to value - duplicate oids
+in:
+  value:
+    value_type: ITEM_VALUE_TYPE_STR
+    time: 2017-10-29 03:15:00 +03:00
+    data: |
+      .1.3.6.1.1 = STRING: "AAA"
+      .1.3.6.1.1 = STRING: "AAA"
+  step:
+    type: ZBX_PREPROC_SNMP_WALK_VALUE
+    params: |-
+      .1.3.6.1.1
+      0
+out:
+  return: SUCCEED
+  value: "AAA"
 ...