diff --git a/test/big/bitset.result b/test/big/bitset.result
index 63ecbcea96e27abd3182c9b19403911bd77a9891..23c3820e663571910c727cc1d9af27c727a4fee1 100644
--- a/test/big/bitset.result
+++ b/test/big/bitset.result
@@ -6,9 +6,7 @@ dofile('bitset.lua')
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: insert/delete
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 test_insert_delete(128)
 ---
 sorted output
@@ -16,9 +14,7 @@ $       1$
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: ALL
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 clear()
 ---
 ...
@@ -159,9 +155,7 @@ $     128$
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: BITS_ALL_SET (single bit)
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 dump(box.index.BITS_ALL_SET, 0)
 ---
 sorted output
@@ -384,9 +378,7 @@ error: 'Supplied key field type does not match index type: expected u32'
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: BITS_ALL_SET (multiple bit)
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 dump(box.index.BITS_ALL_SET, 3)
 ---
 sorted output
@@ -549,9 +541,7 @@ sorted output
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: BITS_ALL_NOT_SET (single bit)
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 dump(box.index.BITS_ALL_NOT_SET, 0)
 ---
 sorted output
@@ -826,9 +816,7 @@ error: 'Supplied key field type does not match index type: expected u32'
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: BITS_ALL_NOT_SET (multiple bit)
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 dump(box.index.BITS_ALL_NOT_SET, 3)
 ---
 sorted output
@@ -951,9 +939,7 @@ sorted output
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: BITS_ANY_SET (single bit)
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 dump(box.index.BITS_ANY_SET, 0)
 ---
 sorted output
@@ -1037,9 +1023,7 @@ error: 'Supplied key field type does not match index type: expected u32'
 ...
 ------------------------------------------------------------------------------
 -- BitsetIndex: BITS_ANY_SET (multiple bit)
-------------------------------------------------------------------------------
----
-...
+------------------------------------------------------------------------------;
 dump(box.index.BITS_ANY_SET, 7)
 ---
 sorted output
@@ -1397,6 +1381,3 @@ $     126$
 $     127$
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/bitset.test.lua b/test/big/bitset.test.lua
index 05b3f0b455254ea9be9860bcd9e1687b8ab7546e..9b1ebfb6c00a17a0714c11c75f2feb53a59db360 100644
--- a/test/big/bitset.test.lua
+++ b/test/big/bitset.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 dofile('utils.lua');
 dofile('bitset.lua');
 ------------------------------------------------------------------------------
diff --git a/test/big/hash.result b/test/big/hash.result
index 43ef6ff3073de0135a38c53432428b2169c0ae0e..f5b42ccb680d3245aa7d14f165dd1464cafdb441 100644
--- a/test/big/hash.result
+++ b/test/big/hash.result
@@ -6,12 +6,8 @@ dofile('utils.lua')
 ...
 -------------------------------------------------------------------------------
 -- 32-bit hash insert fields tests
--------------------------------------------------------------------------------
----
-...
--- Insert valid fieds
----
-...
+-------------------------------------------------------------------------------;
+-- Insert valid fields;
 box.space[10]:insert(0, 'value1 v1.0', 'value2 v1.0')
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -28,21 +24,15 @@ box.space[10]:insert(3, 'value1 v1.0', 'value2 v1.0')
 ---
  - 3: {'value1 v1.0', 'value2 v1.0'}
 ...
--- Insert invalid fields
----
-...
+-- Insert invalid fields;
 box.space[10]:insert('invalid key', 'value1 v1.0', 'value2 v1.0')
 ---
 error: 'Supplied key field type does not match index type: expected NUM'
 ...
 -------------------------------------------------------------------------------
 -- 32-bit hash replace fields tests
--------------------------------------------------------------------------------
----
-...
--- Replace valid fieds
----
-...
+-------------------------------------------------------------------------------;
+-- Replace valid fields;
 box.space[10]:replace(3, 'value1 v1.31', 'value2 1.12')
 ---
  - 3: {'value1 v1.31', 'value2 1.12'}
@@ -55,21 +45,15 @@ box.space[10]:replace(2, 'value1 v1.43', 'value2 1.92')
 ---
  - 2: {'value1 v1.43', 'value2 1.92'}
 ...
--- Replace invalid fields
----
-...
+-- Replace invalid fields;
 box.space[10]:replace('invalid key', 'value1 v1.0', 'value2 v1.0')
 ---
 error: 'Supplied key field type does not match index type: expected NUM'
 ...
 -------------------------------------------------------------------------------
 -- 32-bit hash select fields test
--------------------------------------------------------------------------------
----
-...
--- select by valid keys
----
-...
+-------------------------------------------------------------------------------;
+-- select by valid keys;
 box.space[10]:select(0, 0)
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -92,9 +76,7 @@ box.space[10]:select(0, 4)
 box.space[10]:select(0, 5)
 ---
 ...
--- select by invalid keys
----
-...
+-- select by invalid keys;
 box.space[10]:select(0, 'invalid key')
 ---
 error: 'Supplied key field type does not match index type: expected u32'
@@ -105,12 +87,8 @@ error: 'Invalid key part count (expected [0..1], got 2)'
 ...
 -------------------------------------------------------------------------------
 -- 32-bit hash delete fields test
--------------------------------------------------------------------------------
----
-...
--- delete by valid keys
----
-...
+-------------------------------------------------------------------------------;
+-- delete by valid keys;
 box.space[10]:delete(0)
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -133,9 +111,7 @@ box.space[10]:delete(4)
 box.space[10]:delete(5)
 ---
 ...
--- delete by invalid keys
----
-...
+-- delete by invalid keys;
 box.space[10]:delete('invalid key')
 ---
 error: 'Supplied key field type does not match index type: expected u32'
@@ -146,17 +122,11 @@ error: 'Invalid key part count in an exact match (expected 1, got 2)'
 ...
 --=============================================================================
 -- 64-bit hash tests
---=============================================================================
----
-...
+--=============================================================================;
 -------------------------------------------------------------------------------
 -- 64-bit hash inset fields tests
--------------------------------------------------------------------------------
----
-...
--- Insert valid fieds
----
-...
+-------------------------------------------------------------------------------;
+-- Insert valid fields;
 box.space[11]:insert(0ULL, 'value1 v1.0', 'value2 v1.0')
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -173,9 +143,7 @@ box.space[11]:insert(3ULL, 'value1 v1.0', 'value2 v1.0')
 ---
  - 3: {'value1 v1.0', 'value2 v1.0'}
 ...
--- Insert invalid fields
----
-...
+-- Insert invalid fields;
 box.space[11]:insert(100, 'value1 v1.0', 'value2 v1.0')
 ---
 error: 'Supplied key field type does not match index type: expected NUM64'
@@ -198,12 +166,8 @@ error: 'Supplied key field type does not match index type: expected NUM64'
 ...
 -------------------------------------------------------------------------------
 -- 64-bit hash replace fields tests
--------------------------------------------------------------------------------
----
-...
--- Replace valid fieds
----
-...
+-------------------------------------------------------------------------------;
+-- Replace valid fields;
 box.space[11]:replace(3ULL, 'value1 v1.31', 'value2 1.12')
 ---
  - 3: {'value1 v1.31', 'value2 1.12'}
@@ -216,9 +180,7 @@ box.space[11]:replace(2ULL, 'value1 v1.43', 'value2 1.92')
 ---
  - 2: {'value1 v1.43', 'value2 1.92'}
 ...
--- Replace invalid fields
----
-...
+-- Replace invalid fields;
 box.space[11]:replace(3, 'value1 v1.31', 'value2 1.12')
 ---
 error: 'Supplied key field type does not match index type: expected NUM64'
@@ -237,12 +199,8 @@ error: 'Supplied key field type does not match index type: expected NUM64'
 ...
 -------------------------------------------------------------------------------
 -- 64-bit hash select fields test
--------------------------------------------------------------------------------
----
-...
--- select by valid keys
----
-...
+-------------------------------------------------------------------------------;
+-- select by valid keys;
 box.space[11]:select(0, 0ULL)
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -265,9 +223,7 @@ box.space[11]:select(0, 4ULL)
 box.space[11]:select(0, 5ULL)
 ---
 ...
--- select by valid NUM keys
----
-...
+-- select by valid NUM keys;
 box.space[11]:select(0, 0)
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -290,9 +246,7 @@ box.space[11]:select(0, 4)
 box.space[11]:select(0, 5)
 ---
 ...
--- select by invalid keys
----
-...
+-- select by invalid keys;
 box.space[11]:select(0, 'invalid key')
 ---
 error: 'Supplied key field type does not match index type: expected u64'
@@ -303,12 +257,8 @@ error: 'Invalid key part count (expected [0..1], got 2)'
 ...
 -------------------------------------------------------------------------------
 -- 64-bit hash delete fields test
--------------------------------------------------------------------------------
----
-...
--- delete by valid keys
----
-...
+-------------------------------------------------------------------------------;
+-- delete by valid keys;
 box.space[11]:delete(0ULL)
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -347,9 +297,7 @@ box.space[11]:insert(3ULL, 'value1 v1.0', 'value2 v1.0')
 ---
  - 3: {'value1 v1.0', 'value2 v1.0'}
 ...
--- delete by valid NUM keys
----
-...
+-- delete by valid NUM keys;
 box.space[11]:delete(0)
 ---
  - 0: {'value1 v1.0', 'value2 v1.0'}
@@ -372,9 +320,7 @@ box.space[11]:delete(4)
 box.space[11]:delete(5)
 ---
 ...
--- delete by invalid keys
----
-...
+-- delete by invalid keys;
 box.space[11]:delete('invalid key')
 ---
 error: 'Supplied key field type does not match index type: expected u64'
@@ -385,17 +331,11 @@ error: 'Invalid key part count in an exact match (expected 1, got 2)'
 ...
 --=============================================================================
 -- String hash tests
---=============================================================================
----
-...
+--=============================================================================;
 -------------------------------------------------------------------------------
 -- String hash inset fields tests
--------------------------------------------------------------------------------
----
-...
--- Insert valid fieds
----
-...
+-------------------------------------------------------------------------------;
+-- Insert valid fields;
 box.space[12]:insert('key 0', 'value1 v1.0', 'value2 v1.0')
 ---
  - 'key 0': {'value1 v1.0', 'value2 v1.0'}
@@ -414,12 +354,8 @@ box.space[12]:insert('key 3', 'value1 v1.0', 'value2 v1.0')
 ...
 -------------------------------------------------------------------------------
 -- String hash replace fields tests
--------------------------------------------------------------------------------
----
-...
--- Replace valid fieds
----
-...
+-------------------------------------------------------------------------------;
+-- Replace valid fields;
 box.space[12]:replace('key 3', 'value1 v1.31', 'value2 1.12')
 ---
  - 'key 3': {'value1 v1.31', 'value2 1.12'}
@@ -434,12 +370,8 @@ box.space[12]:replace('key 2', 'value1 v1.43', 'value2 1.92')
 ...
 -------------------------------------------------------------------------------
 -- String hash select fields test
--------------------------------------------------------------------------------
----
-...
--- select by valid keys
----
-...
+-------------------------------------------------------------------------------;
+-- select by valid keys;
 box.space[12]:select(0, 'key 0')
 ---
  - 'key 0': {'value1 v1.0', 'value2 v1.0'}
@@ -462,21 +394,15 @@ box.space[12]:select(0, 'key 4')
 box.space[12]:select(0, 'key 5')
 ---
 ...
--- select by invalid keys
----
-...
+-- select by invalid keys;
 box.space[12]:select(0, 'key 1', 'key 2')
 ---
 error: 'Invalid key part count (expected [0..1], got 2)'
 ...
 -------------------------------------------------------------------------------
 -- String hash delete fields test
--------------------------------------------------------------------------------
----
-...
--- delete by valid keys
----
-...
+-------------------------------------------------------------------------------;
+-- delete by valid keys;
 box.space[12]:delete('key 0')
 ---
  - 'key 0': {'value1 v1.0', 'value2 v1.0'}
@@ -499,16 +425,12 @@ box.space[12]:delete('key 4')
 box.space[12]:delete('key 5')
 ---
 ...
--- delete by invalid keys
----
-...
+-- delete by invalid keys;
 box.space[12]:delete('key 1', 'key 2')
 ---
 error: 'Invalid key part count in an exact match (expected 1, got 2)'
 ...
--- clean-up
----
-...
+-- clean-up;
 box.space[10]:truncate()
 ---
 ...
@@ -520,9 +442,7 @@ box.space[12]:truncate()
 ...
 ------------------------
 -- hash::replace tests
-------------------------
----
-...
+------------------------;
 box.space[21]:truncate()
 ---
 ...
@@ -538,9 +458,7 @@ box.space[21]:insert(2, 2, 2, 2)
 ---
  - 2: {2, 2, 2}
 ...
--- OK
----
-...
+-- OK;
 box.replace_if_exists(21, 1, 1, 1, 1)
 ---
  - 1: {1, 1, 1}
@@ -581,9 +499,7 @@ box.space[21]:select(3, 1)
 ---
  - 1: {1, 1, 1}
 ...
--- OK
----
-...
+-- OK;
 box.space[21]:insert(10, 10, 10, 10)
 ---
  - 10: {10, 10, 10}
@@ -604,9 +520,7 @@ box.space[21]:select(2, 10)
 box.space[21]:select(3, 10)
 ---
 ...
--- TupleFound (primary key)
----
-...
+-- TupleFound (primary key);
 box.space[21]:insert(1, 10, 10, 10)
 ---
 error: 'Duplicate key exists in unique index 0'
@@ -627,9 +541,7 @@ box.space[21]:select(0, 1)
 ---
  - 1: {1, 1, 1}
 ...
--- TupleNotFound (primary key)
----
-...
+-- TupleNotFound (primary key);
 box.replace_if_exists(21, 10, 10, 10, 10)
 ---
 error: 'Tuple doesn''t exist in index 0'
@@ -646,9 +558,7 @@ box.space[21]:select(2, 10)
 box.space[21]:select(3, 10)
 ---
 ...
--- TupleFound (key --1)
----
-...
+-- TupleFound (key --1);
 box.space[21]:insert(10, 0, 10, 10)
 ---
 error: 'Duplicate key exists in unique index 1'
@@ -669,9 +579,7 @@ box.space[21]:select(1, 0)
 ---
  - 0: {0, 0, 0}
 ...
--- TupleFound (key --1)
----
-...
+-- TupleFound (key --1);
 box.replace_if_exists(21, 2, 0, 10, 10)
 ---
 error: 'Duplicate key exists in unique index 1'
@@ -692,9 +600,7 @@ box.space[21]:select(1, 0)
 ---
  - 0: {0, 0, 0}
 ...
--- TupleFound (key --3)
----
-...
+-- TupleFound (key --3);
 box.space[21]:insert(10, 10, 10, 0)
 ---
 error: 'Duplicate key exists in unique index 3'
@@ -715,9 +621,7 @@ box.space[21]:select(3, 0)
 ---
  - 0: {0, 0, 0}
 ...
--- TupleFound (key --3)
----
-...
+-- TupleFound (key --3);
 box.replace_if_exists(21, 2, 10, 10, 0)
 ---
 error: 'Duplicate key exists in unique index 3'
@@ -742,6 +646,3 @@ box.space[21]:truncate()
 ---
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/hash.test.lua b/test/big/hash.test.lua
index 52d6fc24c7b6b6b9b6594a2537150b375e149144..9d5804cc4aa34cb0be7a20eeb793558a4de0cf20 100644
--- a/test/big/hash.test.lua
+++ b/test/big/hash.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 dofile('utils.lua')
 
 --=============================================================================
@@ -7,7 +8,7 @@ dofile('utils.lua')
 -- 32-bit hash insert fields tests
 -------------------------------------------------------------------------------;
 
--- Insert valid fieds;
+-- Insert valid fields;
 box.space[10]:insert(0, 'value1 v1.0', 'value2 v1.0');
 box.space[10]:insert(1, 'value1 v1.0', 'value2 v1.0');
 box.space[10]:insert(2, 'value1 v1.0', 'value2 v1.0');
@@ -20,7 +21,7 @@ box.space[10]:insert('invalid key', 'value1 v1.0', 'value2 v1.0');
 -- 32-bit hash replace fields tests
 -------------------------------------------------------------------------------;
 
--- Replace valid fieds;
+-- Replace valid fields;
 box.space[10]:replace(3, 'value1 v1.31', 'value2 1.12');
 box.space[10]:replace(1, 'value1 v1.32', 'value2 1.72');
 box.space[10]:replace(2, 'value1 v1.43', 'value2 1.92');
@@ -67,7 +68,7 @@ box.space[10]:delete(1, 2);
 -- 64-bit hash inset fields tests
 -------------------------------------------------------------------------------;
 
--- Insert valid fieds;
+-- Insert valid fields;
 box.space[11]:insert(0ULL, 'value1 v1.0', 'value2 v1.0');
 box.space[11]:insert(1ULL, 'value1 v1.0', 'value2 v1.0');
 box.space[11]:insert(2ULL, 'value1 v1.0', 'value2 v1.0');
@@ -84,7 +85,7 @@ box.space[11]:insert('invalid key', 'value1 v1.0', 'value2 v1.0');
 -- 64-bit hash replace fields tests
 -------------------------------------------------------------------------------;
 
--- Replace valid fieds;
+-- Replace valid fields;
 box.space[11]:replace(3ULL, 'value1 v1.31', 'value2 1.12');
 box.space[11]:replace(1ULL, 'value1 v1.32', 'value2 1.72');
 box.space[11]:replace(2ULL, 'value1 v1.43', 'value2 1.92');
@@ -155,7 +156,7 @@ box.space[11]:delete('00000001', '00000002');
 -- String hash inset fields tests
 -------------------------------------------------------------------------------;
 
--- Insert valid fieds;
+-- Insert valid fields;
 box.space[12]:insert('key 0', 'value1 v1.0', 'value2 v1.0');
 box.space[12]:insert('key 1', 'value1 v1.0', 'value2 v1.0');
 box.space[12]:insert('key 2', 'value1 v1.0', 'value2 v1.0');
@@ -165,7 +166,7 @@ box.space[12]:insert('key 3', 'value1 v1.0', 'value2 v1.0');
 -- String hash replace fields tests
 -------------------------------------------------------------------------------;
 
--- Replace valid fieds;
+-- Replace valid fields;
 box.space[12]:replace('key 3', 'value1 v1.31', 'value2 1.12');
 box.space[12]:replace('key 1', 'value1 v1.32', 'value2 1.72');
 box.space[12]:replace('key 2', 'value1 v1.43', 'value2 1.92');
diff --git a/test/big/hash_multipart.result b/test/big/hash_multipart.result
index dab656a52b98f7f0a34f93e75b75149ed519b483..45bc9112a42043c04c9c5b77a6c0dbe674ffac8a 100644
--- a/test/big/hash_multipart.result
+++ b/test/big/hash_multipart.result
@@ -34,16 +34,12 @@ box.space[27]:insert(1, 'bar', 1, '', 4)
 ---
  - 1: {'bar', 1, '', 4}
 ...
--- try to insert a row with a duplicate key
----
-...
+-- try to insert a row with a duplicate key;
 box.space[27]:insert(1, 'bar', 1, '', 5)
 ---
 error: 'Duplicate key exists in unique index 0'
 ...
--- output all rows
----
-...
+-- output all rows;
 function box.select_all(space)
     local result = {}
     for k, v in box.space[space]:pairs() do
@@ -73,57 +69,41 @@ box.space[27]:select(0, 1, 'bar', 0)
 ---
  - 1: {'bar', 0, '', 4}
 ...
--- primary index select with missing part
----
-...
+-- primary index select with missing part;
 box.space[27]:select(0, 1, 'foo')
 ---
 error: 'Invalid key part count in an exact match (expected 3, got 2)'
 ...
--- primary index select with extra part
----
-...
+-- primary index select with extra part;
 box.space[27]:select(0, 1, 'foo', 0, 0)
 ---
 error: 'Invalid key part count (expected [0..3], got 4)'
 ...
--- primary index select with wrong type
----
-...
+-- primary index select with wrong type;
 box.space[27]:select(0, 1, 'foo', 'baz')
 ---
 error: 'Supplied key field type does not match index type: expected u32'
 ...
--- secondary index select
----
-...
+-- secondary index select;
 box.space[27]:select(1, 1, 4)
 ---
  - 1: {'bar', 1, '', 4}
 ...
--- secondary index select with no such key
----
-...
+-- secondary index select with no such key;
 box.space[27]:select(1, 1, 5)
 ---
 ...
--- secondary index select with missing part
----
-...
+-- secondary index select with missing part;
 box.space[27]:select(1, 1)
 ---
 error: 'Invalid key part count in an exact match (expected 2, got 1)'
 ...
--- secondary index select with wrong type
----
-...
+-- secondary index select with wrong type;
 box.space[27]:select(1, 1, 'baz')
 ---
 error: 'Supplied key field type does not match index type: expected u32'
 ...
--- cleanup
----
-...
+-- cleanup;
 box.space[27]:truncate()
 ---
 ...
@@ -132,6 +112,3 @@ box.space[27]:len()
  - 0
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/hash_multipart.test.lua b/test/big/hash_multipart.test.lua
index b6c2a91c4a83bb98d2b17be1c7ef222740f27594..a1700cb0e9ef801333172710d9f2834344600423 100644
--- a/test/big/hash_multipart.test.lua
+++ b/test/big/hash_multipart.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 dofile('utils.lua')
 
 -- insert rows;
diff --git a/test/big/iterator.result b/test/big/iterator.result
index 833f5e8bbb0e70d7880528d4ee64e932b571f703..59ffba33a8ea727b68f986df2f7504a1bd0de442 100644
--- a/test/big/iterator.result
+++ b/test/big/iterator.result
@@ -43,9 +43,7 @@ box.space[20]:insert('pid_023', 'sid_005', 'tid_994', 'a')
 ...
 -------------------------------------------------------------------------------
 -- Iterator: tree single-part unique
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 iterate(20, 0, 0, 1)
 ---
 $pid_001$
@@ -212,9 +210,7 @@ iterate(20, 0, 0, 1, box.index.LT, 'pid_000')
 ...
 -------------------------------------------------------------------------------
 -- Iterator: tree single-part non-unique
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 iterate(20, 1, 1, 2, box.index.ALL)
 ---
 $sid_001$
@@ -364,9 +360,7 @@ iterate(20, 1, 1, 2, box.index.LT, 'sid_000')
 ...
 -------------------------------------------------------------------------------
 -- Iterator: tree multi-part unique
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 iterate(20, 2, 1, 3, box.index.ALL)
 ---
 $sid_001$tid_997$
@@ -591,9 +585,7 @@ iterate(20, 2, 1, 3, box.index.LT, 'sid_000')
 ...
 -------------------------------------------------------------------------------
 -- Iterator: tree multi-part non-unique
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 iterate(20, 3, 2, 4, box.index.ALL)
 ---
 $tid_994$a$
@@ -768,9 +760,7 @@ error: 'utils.lua:27: Key part count 4 is greater than index part count 2'
 ...
 -------------------------------------------------------------------------------
 -- Iterator: hash single-part unique
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 iterate(20, 4, 0, 1)
 ---
 sorted output
@@ -841,9 +831,7 @@ sorted output
 ...
 -------------------------------------------------------------------------------
 -- Iterator: hash multi-part unique
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 iterate(20, 5, 1, 3, box.index.ALL)
 ---
 sorted output
@@ -903,9 +891,7 @@ $sid_006$tid_996$
 ...
 -------------------------------------------------------------------------------
 -- Iterator: various
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 box.space[20].index[0]:iterator(-666)
 ---
 error: 'unknown iterator type: -666'
@@ -914,6 +900,3 @@ box.space[20]:truncate()
 ---
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/iterator.test.lua b/test/big/iterator.test.lua
index 47134149e9e227f0284485ff1b5b1aa81b0604e2..abf04bb1c9e3b5d72662c425aa86109e6edb5721 100644
--- a/test/big/iterator.test.lua
+++ b/test/big/iterator.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 dofile('utils.lua');
 
 box.space[20]:insert('pid_001', 'sid_001', 'tid_998', 'a');
diff --git a/test/big/lua.result b/test/big/lua.result
index 61a4c93a662bcc62805adbad2730f445ce41a2a1..db4033c02808fc9a9517f17e4e1d2aee56e8bd4f 100644
--- a/test/big/lua.result
+++ b/test/big/lua.result
@@ -19,9 +19,7 @@ box.select('1', '1', 'new', 'world')
 ...
 -- A test case for Bug #904208
 -- "assert failed, when key cardinality is greater than index cardinality"
---  https://bugs.launchpad.net/tarantool/+bug/904208 
----
-...
+--  https://bugs.launchpad.net/tarantool/+bug/904208 ;
 box.select('1', '1', 'new', 'world', 'order')
 ---
 error: 'Invalid key part count (expected [0..2], got 3)'
@@ -32,9 +30,7 @@ box.delete('1', 'brave')
 ...
 -- A test case for Bug #902091
 -- "Positioned iteration over a multipart index doesn't work"
--- https://bugs.launchpad.net/tarantool/+bug/902091
----
-...
+-- https://bugs.launchpad.net/tarantool/+bug/902091;
 box.space[1]:insert('item 1', 'alabama', 'song')
 ---
  - 'item 1': {'alabama', 1735290739}
@@ -87,9 +83,7 @@ box.delete('1', 'item 4')
 ...
 --
 -- Check range scan over multipart keys
---
----
-...
+--;
 box.space[5]:insert('01234567', 'new', 'world')
 ---
  - 3978425819141910832: {'new', 'world'}
@@ -117,9 +111,7 @@ box.space[5]:truncate()
 ...
 --
 -- Lua 64bit numbers support
---
----
-...
+--;
 box.insert('8', tonumber64('18446744073709551615'), 'magic')
 ---
  - 18446744073709551615: {'magic'}
@@ -195,9 +187,7 @@ box.space[8]:truncate()
 ...
 --
 -- Lua select_reverse_range
---
----
-...
+--;
 box.insert(14, 0, 0)
 ---
  - 0: {0}
@@ -276,9 +266,7 @@ box.space[14]:truncate()
 ...
 --
 -- Tests for box.index iterators
---
----
-...
+--;
 pid = 1
 ---
 ...
@@ -341,9 +329,7 @@ box.space[16]:truncate()
 ...
 --
 -- Tests for lua idx:count()
---
----
-...
+--;
 box.insert(17, 1, 1, 1)
 ---
  - 1: {1, 1}
@@ -401,9 +387,7 @@ box.space[17]:truncate()
 ...
 --
 -- Tests for lua box.auto_increment
---
----
-...
+--;
 box.space[18]:truncate()
 ---
 ...
@@ -428,9 +412,7 @@ box.space[18]:truncate()
 ...
 --
 -- Tests for lua box.auto_increment with NUM64 keys
---
----
-...
+--;
 box.space[25]:truncate()
 ---
 ...
@@ -455,9 +437,7 @@ box.space[25]:truncate()
 ...
 --
 -- Tests for lua tuple:transform()
---
----
-...
+--;
 t = box.insert(12, '1', '2', '3', '4', '5', '6', '7')
 ---
 ...
@@ -531,9 +511,7 @@ error: 'tuple.transform(): unsupported field type ''table'''
 ...
 --
 -- Tests for lua tuple:find() and tuple:findall()
---
----
-...
+--;
 t = box.insert(12, 'A', '2', '3', '4', '3', '2', '5', '6', '3', '7')
 ---
 ...
@@ -606,9 +584,7 @@ box.space[12]:truncate()
 ...
 -- A test case for Bug #1038784
 -- transform returns wrong tuple and put broken reply into socket
--- https://bugs.launchpad.net/tarantool/+bug/1038784
----
-...
+-- https://bugs.launchpad.net/tarantool/+bug/1038784;
 dofile('push.lua')
 ---
 ...
@@ -654,9 +630,7 @@ push_collection(5, 1038784, 'hey')
 ...
 --
 -- A test case for Bug#1060967: truncation of 64-bit numbers
---
----
-...
+--;
 box.space[5]:insert(2^51, 'hello', 'world')
 ---
  - 2251799813685248: {'hello', 'world'}
@@ -669,12 +643,8 @@ box.space[5]:truncate()
 ---
 ...
 --
--- Test that we print index number in error ER_INDEX_VIOLATION
----
-...
---
----
-...
+-- Test that we print index number in error ER_INDEX_VIOLATION;
+--;
 box.space[1]:insert(1, 'hello', 'world')
 ---
  - 1: {'hello', 'world'}
@@ -688,12 +658,8 @@ box.space[1]:truncate()
 ...
 -- A test case for Bug #1042798
 -- Truncate hangs when primary key is not in linear or starts at the first field
--- https://bugs.launchpad.net/tarantool/+bug/1042798
----
-...
--- Print key fields in pk
----
-...
+-- https://bugs.launchpad.net/tarantool/+bug/1042798;
+-- Print key fields in pk;
 for k, f in pairs(box.space[23].index[0].key_field) do print(k,  ' => ', f.fieldno) end
 ---
 0 => 2
@@ -717,23 +683,17 @@ for _, v in box.space[23]:pairs() do print(' - ', v) end
  - 10: {20, 30, 40}
  - 20: {30, 40, 50}
 ...
--- Truncate must not hang
----
-...
+-- Truncate must not hang;
 box.space[23]:truncate()
 ---
 ...
--- Empty result
----
-...
+-- Empty result;
 for _, v in box.space[23]:pairs() do print(' - ', v) end
 ---
 ...
 -------------------------------------------------------------------------------
 -- TreeIndex::random()
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 index_random_test(26, 0)
 ---
 all values have been found
@@ -741,15 +701,10 @@ all values have been found
 ...
 -------------------------------------------------------------------------------
 -- HashIndex::random()
--------------------------------------------------------------------------------
----
-...
+-------------------------------------------------------------------------------;
 index_random_test(26, 1)
 ---
 all values have been found
  - true
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/lua.test.lua b/test/big/lua.test.lua
index c4d65106890793c025f18381ca959b2c0cdb9725..d149e22d601ddb0c3e42ce0ff66e262b7cefb2ca 100644
--- a/test/big/lua.test.lua
+++ b/test/big/lua.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 dofile('index_random_test.lua');
 
 box.space[1]:insert('brave', 'new', 'world');
diff --git a/test/big/tree_pk.result b/test/big/tree_pk.result
index f0b19d1e12b782fc4ccadb80021f7f41e88c0638..4490780075c7ff5be9e496f2b92118cb3c5c0b26 100644
--- a/test/big/tree_pk.result
+++ b/test/big/tree_pk.result
@@ -1,9 +1,7 @@
 dofile('utils.lua')
 ---
 ...
--- integer keys
----
-...
+-- integer keys;
 box.space[2]:insert(1, 'tuple')
 ---
  - 1: {'tuple'}
@@ -36,9 +34,7 @@ box.space[2]:select(0, 3)
 ---
  - 3: {'tuple 3'}
 ...
--- Cleanup
----
-...
+-- Cleanup;
 box.space[2]:delete(1)
 ---
  - 1: {'tuple'}
@@ -52,9 +48,7 @@ box.space[2]:delete(3)
  - 3: {'tuple 3'}
 ...
 -- Test incorrect keys - supplied key field type does not match index type
--- https://bugs.launchpad.net/tarantool/+bug/1072624
----
-...
+-- https://bugs.launchpad.net/tarantool/+bug/1072624;
 box.space[2]:insert('xxxxxxx')
 ---
 error: 'Supplied key field type does not match index type: expected NUM'
@@ -67,9 +61,7 @@ box.space[2]:insert('12')
 ---
 error: 'Supplied key field type does not match index type: expected NUM'
 ...
--- string keys
----
-...
+-- string keys;
 box.space[3]:insert('identifier', 'tuple')
 ---
  - 'identifier': {'tuple'}
@@ -111,9 +103,7 @@ box.space[3]:select(0, 'third')
 ---
  - 'third': {'tuple 3'}
 ...
--- Cleanup
----
-...
+-- Cleanup;
 box.space[3]:delete('identifier')
 ---
  - 'identifier': {'tuple'}
@@ -185,9 +175,7 @@ box.crossjoin('3', '2', '10000')
 box.space[3]:truncate()
 ---
 ...
--- Bug #922520 - select missing keys
----
-...
+-- Bug #922520 - select missing keys;
 box.space[2]:insert(200, 'select me!')
 ---
  - 200: {'select me!'}
@@ -202,9 +190,7 @@ box.space[2]:select(0, 199)
 box.space[2]:select(0, 201)
 ---
 ...
--- Test partially specified keys in TREE indexes
----
-...
+-- Test partially specified keys in TREE indexes;
 box.space[15]:insert('abcd')
 ---
  - 1684234849: {}
@@ -252,9 +238,7 @@ box.space[15]:truncate()
 ...
 --
 -- tree::replace tests
---
----
-...
+--;
 box.space[22]:truncate()
 ---
 ...
@@ -270,9 +254,7 @@ box.space[22]:insert(2, 2, 2, 2)
 ---
  - 2: {2, 2, 2}
 ...
--- OK
----
-...
+-- OK;
 box.replace_if_exists(22, 1, 1, 1, 1)
 ---
  - 1: {1, 1, 1}
@@ -313,9 +295,7 @@ box.space[22]:select(3, 1)
 ---
  - 1: {1, 1, 1}
 ...
--- OK
----
-...
+-- OK;
 box.space[22]:insert(10, 10, 10, 10)
 ---
  - 10: {10, 10, 10}
@@ -336,10 +316,7 @@ box.space[22]:select(2, 10)
 box.space[22]:select(3, 10)
 ---
 ...
-
--- TupleFound (primary key)
----
-...
+-- TupleFound (primary key);
 box.space[22]:insert(1, 10, 10, 10)
 ---
 error: 'Duplicate key exists in unique index 0'
@@ -360,9 +337,7 @@ box.space[22]:select(0, 1)
 ---
  - 1: {1, 1, 1}
 ...
--- TupleNotFound (primary key)
----
-...
+-- TupleNotFound (primary key);
 box.replace_if_exists(22, 10, 10, 10, 10)
 ---
 error: 'Tuple doesn''t exist in index 0'
@@ -379,9 +354,7 @@ box.space[22]:select(2, 10)
 box.space[22]:select(3, 10)
 ---
 ...
--- TupleFound (key #1)
----
-...
+-- TupleFound (key #1);
 box.space[22]:insert(10, 0, 10, 10)
 ---
 error: 'Duplicate key exists in unique index 1'
@@ -402,9 +375,7 @@ box.space[22]:select(1, 0)
 ---
  - 0: {0, 0, 0}
 ...
--- TupleFound (key #1)
----
-...
+-- TupleFound (key #1);
 box.replace_if_exists(22, 2, 0, 10, 10)
 ---
 error: 'Duplicate key exists in unique index 1'
@@ -425,9 +396,7 @@ box.space[22]:select(1, 0)
 ---
  - 0: {0, 0, 0}
 ...
--- TupleFound (key #3)
----
-...
+-- TupleFound (key #3);
 box.space[22]:insert(10, 10, 10, 0)
 ---
 error: 'Duplicate key exists in unique index 3'
@@ -448,9 +417,7 @@ box.space[22]:select(3, 0)
 ---
  - 0: {0, 0, 0}
 ...
--- TupleFound (key #3)
----
-...
+-- TupleFound (key #3);
 box.replace_if_exists(22, 2, 10, 10, 0)
 ---
 error: 'Duplicate key exists in unique index 3'
@@ -471,9 +438,7 @@ box.space[22]:select(3, 0)
 ---
  - 0: {0, 0, 0}
 ...
--- Non-Uniq test (key #2)
----
-...
+-- Non-Uniq test (key #2);
 box.space[22]:insert(4, 4, 0, 4)
 ---
  - 4: {4, 0, 4}
@@ -511,6 +476,3 @@ box.space[22]:truncate()
 ---
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/tree_pk.test.lua b/test/big/tree_pk.test.lua
index e412e8efd9f07d1744624c70d31526bc42623b55..02030659f014db6d8873421784dfae9391ff84e5 100644
--- a/test/big/tree_pk.test.lua
+++ b/test/big/tree_pk.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 dofile('utils.lua');
 
 -- integer keys;
diff --git a/test/big/tree_pk_multipart.result b/test/big/tree_pk_multipart.result
index 2b3aaa0934524108616e338dab99c7fed1948504..0941078a709d7db0c61cd5e29aa759375214d012 100644
--- a/test/big/tree_pk_multipart.result
+++ b/test/big/tree_pk_multipart.result
@@ -1,8 +1,6 @@
 --
 -- Insert test
---
----
-...
+--;
 box.space[9]:insert('Vincent', 'Jules', 0, 'Do you know what they call a - a - a Quarter Pounder with cheese in Paris?')
 ---
  - 'Vincent': {'Jules', 0, 'Do you know what they call a - a - a Quarter Pounder with cheese in Paris?'}
@@ -85,12 +83,8 @@ box.space[9]:insert('Vincent', 'The Wolf!', 2, 'If I`m curt with you it`s becaus
 ...
 --
 -- Select test
---
----
-...
--- Select by one entry
----
-...
+--;
+-- Select by one entry;
 box.select(9, 0, 'Vincent', 'Jules', 0)
 ---
  - 'Vincent': {'Jules', 0, 'Do you know what they call a - a - a Quarter Pounder with cheese in Paris?'}
@@ -171,9 +165,7 @@ box.select(9, 0, 'Vincent', 'The Wolf!', 2)
 ---
  - 'Vincent': {'The Wolf!', 2, 'If I`m curt with you it`s because time is a factor. I think fast, I talk fast and I need you guys to act fast if you wanna get out of this. So, pretty please... with sugar on top. Clean the fucking car.'}
 ...
--- Select all messages from Vincent to Jules
----
-...
+-- Select all messages from Vincent to Jules;
 box.select(9, 0, 'Vincent', 'Jules')
 ---
  - 'Vincent': {'Jules', 0, 'Do you know what they call a - a - a Quarter Pounder with cheese in Paris?'}
@@ -184,9 +176,7 @@ box.select(9, 0, 'Vincent', 'Jules')
  - 'Vincent': {'Jules', 5, 'Ha, ha, ha.'}
  - 'Vincent': {'Jules', 6, 'I dunno, I didn`t go into Burger King.'}
 ...
--- Select all messages from Jules to Vincent
----
-...
+-- Select all messages from Jules to Vincent;
 box.select(9, 0, 'Jules', 'Vincent')
 ---
  - 'Jules': {'Vincent', 0, 'They don`t call it a Quarter Pounder with cheese?'}
@@ -196,18 +186,14 @@ box.select(9, 0, 'Jules', 'Vincent')
  - 'Jules': {'Vincent', 4, '`Le Big Mac!`'}
  - 'Jules': {'Vincent', 5, 'What do they call a `Whopper`?'}
 ...
--- Select all messages from Vincent to The Wolf
----
-...
+-- Select all messages from Vincent to The Wolf;
 box.select(9, 0, 'Vincent', 'The Wolf!')
 ---
  - 'Vincent': {'The Wolf!', 0, 'A please would be nice.'}
  - 'Vincent': {'The Wolf!', 1, 'I said a please would be nice.'}
  - 'Vincent': {'The Wolf!', 2, 'If I`m curt with you it`s because time is a factor. I think fast, I talk fast and I need you guys to act fast if you wanna get out of this. So, pretty please... with sugar on top. Clean the fucking car.'}
 ...
--- Select all messages from The Wolf to Vincent
----
-...
+-- Select all messages from The Wolf to Vincent;
 box.select(9, 0, 'The Wolf!', 'Vincent')
 ---
  - 'The Wolf!': {'Vincent', 0, 'Jimmie, lead the way. Boys, get to work.'}
@@ -215,9 +201,7 @@ box.select(9, 0, 'The Wolf!', 'Vincent')
  - 'The Wolf!': {'Vincent', 2, 'Get it straight buster - I`m not here to say please, I`m here to tell you what to do and if self-preservation is an instinct you possess you`d better fucking do it and do it quick. I`m here to help - if my help`s not appreciated then lotsa luck, gentlemen.'}
  - 'The Wolf!': {'Vincent', 3, 'I don`t mean any disrespect, I just don`t like people barking orders at me.'}
 ...
--- Select all Vincent messages
----
-...
+-- Select all Vincent messages;
 box.select(9, 0, 'Vincent')
 ---
  - 'Vincent': {'Jules', 0, 'Do you know what they call a - a - a Quarter Pounder with cheese in Paris?'}
@@ -233,12 +217,8 @@ box.select(9, 0, 'Vincent')
 ...
 --
 -- Delete test
---
----
-...
--- Delete some messages from the The Wolf and Vincent dialog
----
-...
+--;
+-- Delete some messages from the The Wolf and Vincent dialog;
 box.delete(9, 'The Wolf!', 'Vincent', 0)
 ---
  - 'The Wolf!': {'Vincent', 0, 'Jimmie, lead the way. Boys, get to work.'}
@@ -259,47 +239,35 @@ box.update(9, {'Updated', 'The Wolf!', 1}, '=p#p', 0, 'Vincent', 4, '')
 ---
  - 'Vincent': {'The Wolf!', 1, 'I said a please would be nice.'}
 ...
--- Checking Vincent's last messages
----
-...
+-- Checking Vincent's last messages;
 box.select(9, 0, 'Vincent', 'The Wolf!')
 ---
  - 'Vincent': {'The Wolf!', 1, 'I said a please would be nice.'}
  - 'Vincent': {'The Wolf!', 2, 'If I`m curt with you it`s because time is a factor. I think fast, I talk fast and I need you guys to act fast if you wanna get out of this. So, pretty please... with sugar on top. Clean the fucking car.'}
 ...
--- Checking The Wolf's last messages
----
-...
+-- Checking The Wolf's last messages;
 box.select(9, 0, 'The Wolf!', 'Vincent')
 ---
  - 'The Wolf!': {'Vincent', 1, 'Come again?'}
  - 'The Wolf!': {'Vincent', 2, 'Get it straight buster - I`m not here to say please, I`m here to tell you what to do and if self-preservation is an instinct you possess you`d better fucking do it and do it quick. I`m here to help - if my help`s not appreciated then lotsa luck, gentlemen.'}
 ...
--- try to delete nonexistent message
----
-...
+-- try to delete nonexistent message;
 box.delete(9, 'Vincent', 'The Wolf!', 3)
 ---
 ...
--- try to delete patrial defined key
----
-...
+-- try to delete patrial defined key;
 box.delete(9, 'Vincent', 'The Wolf!')
 ---
 error: 'Invalid key part count in an exact match (expected 3, got 2)'
 ...
--- try to delete by invalid key
----
-...
+-- try to delete by invalid key;
 box.delete(9, 'The Wolf!', 'Vincent', 1, 'Come again?')
 ---
 error: 'Invalid key part count in an exact match (expected 3, got 4)'
 ...
 --
 -- Update test
---
----
-...
+--;
 box.update(9, {'The Wolf!', 'Vincent', 1}, '=p', 3, '<ooops>')
 ---
  - 'The Wolf!': {'Vincent', 1, '<ooops>'}
@@ -308,38 +276,28 @@ box.update(9, {'Vincent', 'The Wolf!', 1}, '=p', 3, '<ooops>')
 ---
  - 'Vincent': {'The Wolf!', 1, '<ooops>'}
 ...
--- Checking Vincent's last messages
----
-...
+-- Checking Vincent's last messages;
 box.select(9, 0, 'Vincent', 'The Wolf!')
 ---
  - 'Vincent': {'The Wolf!', 1, '<ooops>'}
  - 'Vincent': {'The Wolf!', 2, 'If I`m curt with you it`s because time is a factor. I think fast, I talk fast and I need you guys to act fast if you wanna get out of this. So, pretty please... with sugar on top. Clean the fucking car.'}
 ...
--- Checking The Wolf's last messages
----
-...
+-- Checking The Wolf's last messages;
 box.select(9, 0, 'The Wolf!', 'Vincent')
 ---
  - 'The Wolf!': {'Vincent', 1, '<ooops>'}
  - 'The Wolf!': {'Vincent', 2, 'Get it straight buster - I`m not here to say please, I`m here to tell you what to do and if self-preservation is an instinct you possess you`d better fucking do it and do it quick. I`m here to help - if my help`s not appreciated then lotsa luck, gentlemen.'}
 ...
--- try to update a nonexistent message
----
-...
+-- try to update a nonexistent message;
 box.update(9, {'Vincent', 'The Wolf!', 3}, '=p', 3, '<ooops>')
 ---
 ...
--- try to update patrial defined key
----
-...
+-- try to update patrial defined key;
 box.update(9, {'Vincent', 'The Wolf!'}, '=p', 3, '<ooops>')
 ---
 error: 'Invalid key part count in an exact match (expected 3, got 2)'
 ...
--- try to update by invalid key
----
-...
+-- try to update by invalid key;
 box.update(9, {'The Wolf!', 'Vincent', 1, 'Come again?'}, '=p', 3, '<ooops>')
 ---
 error: 'Invalid key part count in an exact match (expected 3, got 4)'
@@ -356,9 +314,7 @@ box.space[9]:len()
  - 0
 ...
 -- A test case for Bug#1051006 Tree iterators return garbage
---if an index is modified between calls
----
-...
+--if an index is modified between calls;
 box.space[16]:insert('a', 'a', 'a')
 ---
  - 'a': {'a', 'a'}
@@ -426,9 +382,7 @@ end
  - nil
  - nil
 ...
--- Bug #1082356
----
-...
+-- Bug #1082356;
 box.space[19]:insert(1, 1)
 ---
 error: 'Illegal parameters, tuple must have all indexed fields'
@@ -438,6 +392,3 @@ box.replace_if_exists(19, 1, 1)
 error: 'Illegal parameters, tuple must have all indexed fields'
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/tree_pk_multipart.test.lua b/test/big/tree_pk_multipart.test.lua
index 8329c9241c4f6755ce6129e23584e5b891d0d243..5f2b6f2b6551b83e092607f6988b571e3132703c 100644
--- a/test/big/tree_pk_multipart.test.lua
+++ b/test/big/tree_pk_multipart.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 --
 -- Insert test
 --;
diff --git a/test/big/tree_variants.result b/test/big/tree_variants.result
index 02d326d1c8f339facf69aef025fa2248db8f5dae..ab846bfdff9a868a08ca4ed2a6ef965f4b0f42b3 100644
--- a/test/big/tree_variants.result
+++ b/test/big/tree_variants.result
@@ -154,9 +154,7 @@ end
  - 9: {9, 400, 1852337994, 'Smoker', 'Rolls', 'A Blunt', 'foo', 2009}
 ...
 -- Test incorrect keys - supplied key field type does not match index type
--- https://bugs.launchpad.net/tarantool/+bug/1072624
----
-...
+-- https://bugs.launchpad.net/tarantool/+bug/1072624;
 box.space[6]:insert('', '00000001', '00000002', '', '', '', '', '', 0)
 ---
 error: 'Supplied key field type does not match index type: expected NUM'
@@ -174,6 +172,3 @@ box.space[6]:insert(1, 'xxxxxxxxxxx', '00000002', '', '', '', '', '', 0)
 error: 'Supplied key field type does not match index type: expected NUM64'
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/big/tree_variants.test.lua b/test/big/tree_variants.test.lua
index b52125d7dfbae235dff0072964055065480ca420..9f5b8ff12ea75d7b7f123c6dd959aed4f052a572 100644
--- a/test/big/tree_variants.test.lua
+++ b/test/big/tree_variants.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 box.space[6]:insert(0, '00000000', '00000100', 'Joe', 'Sixpack', 'Drinks', 'Amstel', 'bar', 2000);
 box.space[6]:insert(1, '00000001', '00000200', 'Joe', 'Sixpack', 'Drinks', 'Heineken', 'bar', 2001);
 box.space[6]:insert(2, '00000002', '00000200', 'Joe', 'Sixpack', 'Drinks', 'Carlsberg', 'bar', 2002);
diff --git a/test/box/admin_coredump.result b/test/box/admin_coredump.result
index dea994be2702eed1073ae0aeba3e1a4358731af9..c071deffb85f81dfd498372fea558abacde2c9b4 100644
--- a/test/box/admin_coredump.result
+++ b/test/box/admin_coredump.result
@@ -1,12 +1,7 @@
--- moved to separete test becouse this test fail in the valgrind mode (coredump
--- process terminated via abort procedure)
----
-...
+-- moved to separate test because this test fail in the valgrind mode (coredump
+-- process terminated via abort procedure);
 save coredump
 ---
 ok
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/admin_coredump.test.lua b/test/box/admin_coredump.test.lua
index 8e7c8c2254f04c1de0c6563423725fc4613ba08d..52de6ac02fd68b486a936520b52a31c886f0dbfd 100644
--- a/test/box/admin_coredump.test.lua
+++ b/test/box/admin_coredump.test.lua
@@ -1,4 +1,5 @@
--- moved to separete test becouse this test fail in the valgrind mode (coredump
+-- setopt delim ';'
+-- moved to separate test because this test fail in the valgrind mode (coredump
 -- process terminated via abort procedure);
 save coredump;
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
diff --git a/test/box/cjson.result b/test/box/cjson.result
index 3d3b25605b1808af1cca8ae086d295c0f06aadbd..200726b9ef71674908e8b46d5749fd4e75d5f945 100644
--- a/test/box/cjson.result
+++ b/test/box/cjson.result
@@ -1,6 +1,4 @@
--- cjson tests
----
-...
+-- cjson tests;
 type(box.cjson)
 ---
  - table
@@ -38,6 +36,3 @@ box.cjson.decode('{\"test\": \"Результат\"}').test
  - Результат
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/cjson.test.lua b/test/box/cjson.test.lua
index 8519dd032cfbf3ac21dc43536ecefaaed6cc8d0c..f0d7f840fb2ed549724e1b899eff8119489b42bd 100644
--- a/test/box/cjson.test.lua
+++ b/test/box/cjson.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 -- cjson tests;
 type(box.cjson);
 box.cjson.encode(123);
diff --git a/test/box/errinj.result b/test/box/errinj.result
index 5cf38a1c44f2a909290eba8c65409c3ee429d58f..895322253f084fba516386cf44aff24cf11ed1b8 100644
--- a/test/box/errinj.result
+++ b/test/box/errinj.result
@@ -29,9 +29,7 @@ set injection ERRINJ_TESTING off
 ---
 ok
 ...
--- Check how well we handle a failed log write
----
-...
+-- Check how well we handle a failed log write;
 set injection ERRINJ_WAL_IO on
 ---
 ok
@@ -73,9 +71,7 @@ ok
 box.space[0]:truncate()
 ---
 ...
--- Check a failed log rotation
----
-...
+-- Check a failed log rotation;
 set injection ERRINJ_WAL_ROTATE on
 ---
 ok
@@ -141,6 +137,3 @@ box.space[0]:truncate()
 ---
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/errinj.test.lua b/test/box/errinj.test.lua
index c221c486a0a0a73f19cdbbc4a9ce4e60a0299f82..ea60b955c69faa216251ff374678cddc2aab664e 100644
--- a/test/box/errinj.test.lua
+++ b/test/box/errinj.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 show injections;
 set injection some-injection on;
 box.space[0]:select(0,222444);
diff --git a/test/box/fiber.result b/test/box/fiber.result
index bb100300ddc8f307cc178842eb13dcd82ea35056..3f9642ac838f3ff47449c7992881924432ffc5ee 100644
--- a/test/box/fiber.result
+++ b/test/box/fiber.result
@@ -4,9 +4,7 @@
 -- due to cancellation) if it is within th wal_schedule queue.
 -- The test case is dependent on rows_per_wal, since this is when
 -- we reopen the .xlog file and thus wal_scheduler takes a long
--- pause
----
-...
+-- pause;
 box.cfg.rows_per_wal
 ---
  - 50
@@ -27,9 +25,7 @@ box.space[0]:delete(1)
 ---
  - 1: {'testing', 'lua rocks'}
 ...
--- check delete
----
-...
+-- check delete;
 box.process(17, box.pack('iiiiiip', 0, 0, 0, 2^31, 1, 1, 1))
 ---
 ...
@@ -141,9 +137,7 @@ box.insert('0', 'test', 'old', 'abcd')
 ---
  - 1953719668: {'old', 1684234849}
 ...
--- test that insert produces a duplicate key error
----
-...
+-- test that insert produces a duplicate key error;
 box.insert('0', 'test', 'old', 'abcd')
 ---
 error: 'Duplicate key exists in unique index 0'
@@ -179,9 +173,7 @@ reload configuration
 ---
 ok
 ...
--- must be read-only
----
-...
+-- must be read-only;
 box.insert(0, 'test')
 ---
  - 1953719668: {}
@@ -210,9 +202,7 @@ box.space[0]:delete('test')
 ---
  - 1953719668: {'bye, world'}
 ...
--- test tuple iterators
----
-...
+-- test tuple iterators;
 t = box.space[0]:insert('test')
 ---
 ...
@@ -225,9 +215,7 @@ t = box.space[0]:replace('test', 'another field', 'one more')
 box.space[0]:truncate()
 ---
 ...
--- test passing arguments in and out created fiber
----
-...
+-- test passing arguments in and out created fiber;
 function y()
     print('started')
     box.fiber.detach()
@@ -268,9 +256,7 @@ collectgarbage('collect')
 ---
  - 0
 ...
--- check that these newly created fibers are garbage collected
----
-...
+-- check that these newly created fibers are garbage collected;
 box.fiber.find(900)
 ---
  - nil
@@ -287,6 +273,3 @@ box.space[0]:truncate()
 ---
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/fiber.test.lua b/test/box/fiber.test.lua
index 3780162645899786c599b7288138abe603da3c76..c17c5d57b30df310b094142f3084c21e03828930 100644
--- a/test/box/fiber.test.lua
+++ b/test/box/fiber.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 -- A test case for a race condition between ev_schedule
 -- and wal_schedule fiber schedulers.
 -- The same fiber should not be scheduled by ev_schedule (e.g.
diff --git a/test/box/info.result b/test/box/info.result
index 7b902204d47bbb6a65858399309f4371a120fd9a..d789959860c20ebf7bc85fa059c04f227daccdb1 100644
--- a/test/box/info.result
+++ b/test/box/info.result
@@ -1,7 +1,5 @@
 -- Test Lua from admin console. Whenever producing output,
--- make sure it's a valid YAML
----
-...
+-- make sure it's a valid YAML;
 box.info.unknown_variable
 ---
  - nil
@@ -91,6 +89,3 @@ box.info.snapshot_pid
  - 0
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/info.test.lua b/test/box/info.test.lua
index 05123173de51c643d44924b80f4291273486c0b7..f1fc089734c53f1844412dbf77b9540a3320d2bc 100644
--- a/test/box/info.test.lua
+++ b/test/box/info.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 -- Test Lua from admin console. Whenever producing output,
 -- make sure it's a valid YAML;
 box.info.unknown_variable;
diff --git a/test/box/ipc.result b/test/box/ipc.result
index d269f94d14d604cb4dd31afa6bb98a92e4b55fb0..ccbd45a4388a41d0bfbe458a03e1dcc265348857 100644
--- a/test/box/ipc.result
+++ b/test/box/ipc.result
@@ -263,6 +263,3 @@ end
  - "tfbr2 - 45"
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/ipc.test.lua b/test/box/ipc.test.lua
index 5a0821c06bdb2d1c1fc8fe273ab7bf71368badc9..3b640b4ec782b1654580a170183bc728cc491014 100644
--- a/test/box/ipc.test.lua
+++ b/test/box/ipc.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 ch = box.ipc.channel();
 ch:is_full();
 ch:is_empty();
diff --git a/test/box/iproto.test.py b/test/box/iproto.test.py
index c56404851783619dbe3a0caae2ccd2f0764facd3..5b8bd6426f2cd56e47ac5ff8dc59a75483212a4b 100644
--- a/test/box/iproto.test.py
+++ b/test/box/iproto.test.py
@@ -1,4 +1,3 @@
-# encoding: utf-8
 import os
 import sys
 import struct
@@ -17,10 +16,10 @@ s.connect(('localhost', server.primary_port))
 print """
 # Test bug #899343 (server assertion failure on incorrect packet)
 """
-print "# sending the package with invalid length"
+print "# send the package with invalid length"
 inval_request = struct.pack('<LLL', 17, 4294967290, 1)
 print s.send(inval_request)
-print "# checking what is server alive"
+print "# check that is server alive"
 sql("ping")
 
 # closing connection
diff --git a/test/box/lua_box_uuid.result b/test/box/lua_box_uuid.result
index 0b3d6ad0fc6eef9c37bac2c92db1e87e3916b8d1..636eb74d0a5ce86a658692bf99f84f442b7827a4 100644
--- a/test/box/lua_box_uuid.result
+++ b/test/box/lua_box_uuid.result
@@ -1,6 +1,4 @@
--- box.uuid()
----
-...
+-- box.uuid();
 string.len(box.uuid())
 ---
  - 16
@@ -14,6 +12,3 @@ string.match(box.uuid_hex(), '^[a-f0-9]+$') ~= nil
  - true
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/lua_box_uuid.test.lua b/test/box/lua_box_uuid.test.lua
index 1ee3016fc6bff837133980ee03d7151f6d13f28e..1e7d09d2c61b4a110d2f221776e1de29ba1e9ae3 100644
--- a/test/box/lua_box_uuid.test.lua
+++ b/test/box/lua_box_uuid.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 -- box.uuid();
 string.len(box.uuid());
 string.len(box.uuid_hex());
diff --git a/test/box/lua_misc.result b/test/box/lua_misc.result
index 864125aa46a399e303ab2b8fc7b3b418b91cddf7..f930edc0290ee2012c84e3e4b1f315d3ac8ba5a0 100644
--- a/test/box/lua_misc.result
+++ b/test/box/lua_misc.result
@@ -1,8 +1,6 @@
 ----------------
 -- # box.raise
-----------------
----
-...
+----------------;
 1 + 1
 ---
  - 2
@@ -21,9 +19,7 @@ error: '345'
 ...
 ----------------
 -- # box.stat
-----------------
----
-...
+----------------;
 for k, v in pairs(box.stat()) do
     print(' - ', k)
 end
@@ -51,9 +47,7 @@ end
 ...
 ----------------
 -- # box.space
-----------------
----
-...
+----------------;
 type(box)
 ---
  - table
@@ -75,9 +69,7 @@ fieldno : 0
 ...
 ----------------
 -- # box.space
-----------------
----
-...
+----------------;
 string.match(tostring(box.slab), '^table:') ~= nil
 ---
  - true
@@ -104,9 +96,7 @@ end
 ...
 ----------------
 -- # box.error
-----------------
----
-...
+----------------;
 for k,v in pairs(box.error) do
     print('box.error.', k, ' : ', v)
 end
@@ -142,6 +132,3 @@ box.error.ER_SECONDARY : 770
 box.error.ER_MEMORY_ISSUE : 1793
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/lua_misc.test.lua b/test/box/lua_misc.test.lua
index 1b17e2bd262d4fea199985302c1117a53d76a0e3..222085a5635d4729ec84360a0793b6cb897a0554 100644
--- a/test/box/lua_misc.test.lua
+++ b/test/box/lua_misc.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 ----------------
 -- # box.raise
 ----------------;
diff --git a/test/box/net.box.result b/test/box/net.box.result
index 6368955e34d95f8d50421e90f492072589703dc4..aa4cc34b8b5534d8130a6930e97704721cdf0d64 100644
--- a/test/box/net.box.result
+++ b/test/box/net.box.result
@@ -202,6 +202,3 @@ box.space[0]:truncate()
 ---
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/net.box.test.lua b/test/box/net.box.test.lua
index 095c7630e5a62da2090b2a44a5101dd44ee85f36..d379750754f8d9eec82f00bcb5d15f09767a9db5 100644
--- a/test/box/net.box.test.lua
+++ b/test/box/net.box.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 remote = box.net.box.new('localhost', box.cfg.primary_port, '0.5');
 type(remote);
 remote:ping();
diff --git a/test/box/net_sql.mysql.result b/test/box/net_sql.mysql.result
index b32439f43015dc143fe8529c4f70fd247bb74944..ad7807ce9cf3c245b36897431a48b0711b5c6a87 100644
--- a/test/box/net_sql.mysql.result
+++ b/test/box/net_sql.mysql.result
@@ -15,9 +15,7 @@ for tk in string.gmatch(os.getenv('MYSQL'), '[^:]+') do
 end
 ---
 ...
--- mysql
----
-...
+-- mysql;
 c = box.net.sql.connect('mysql', unpack(connect))
 ---
 ...
@@ -89,6 +87,3 @@ c:commit()
  - 0
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/net_sql.mysql.test.lua b/test/box/net_sql.mysql.test.lua
index 8cb24e7f70886f5eecb90761d664a09157bc53d2..a2209a9971e9fef05595ca04e250a8e99d824127 100644
--- a/test/box/net_sql.mysql.test.lua
+++ b/test/box/net_sql.mysql.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 c = box.net.sql.connect('abcd');
 function dump(v) return
     box.cjson.encode(v)
diff --git a/test/box/net_sql.pg.result b/test/box/net_sql.pg.result
index 08181eef1e04b134a91e27d3303de804e53c0ccb..8400c89eeb6c2b9211facb09d6263fee8c3e76c9 100644
--- a/test/box/net_sql.pg.result
+++ b/test/box/net_sql.pg.result
@@ -13,9 +13,7 @@ for tk in string.gmatch(os.getenv('PG'), '[^:]+') do
 end
 ---
 ...
--- postgresql
----
-...
+-- postgresql;
 c = box.net.sql.connect('pg', unpack(connect))
 ---
 ...
@@ -123,6 +121,3 @@ c:txn(
  - true
 ...
 -- vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 syntax=lua
-
----
-...
diff --git a/test/box/net_sql.pg.test.lua b/test/box/net_sql.pg.test.lua
index 92037c22136995e9a98d9d1800ed7be9c96e49de..c9f0232ec1efd7c297384bf53f1341cf14fde2b5 100644
--- a/test/box/net_sql.pg.test.lua
+++ b/test/box/net_sql.pg.test.lua
@@ -1,3 +1,4 @@
+-- setopt delim ';'
 c = box.net.sql.connect('abcd');
 dump = function(v) return box.cjson.encode(v) end;
 
diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py
index a35e673cff7a47c92720394a633b042087f27771..c5bff906a0a190ba264777d4ec4438969481f99e 100644
--- a/test/lib/tarantool_server.py
+++ b/test/lib/tarantool_server.py
@@ -19,6 +19,11 @@ from test_suite import FilteredStream, Test
 from admin_connection import AdminConnection
 from memcached_connection import MemcachedConnection
 
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
+
 def check_port(port):
     """Check if the port we're connecting to is available"""
     try:
@@ -54,8 +59,29 @@ class FuncTest(Test):
 
 class LuaTest(FuncTest):
     def execute(self, server):
-        for i in open(self.name, 'r').read().replace('\n\n', '\n').split(';\n'):
-             server.admin(i)
+        delim = ''
+        cmd = None
+        for line in open(self.name, 'r'):
+            if not line.strip():
+                continue
+            if not cmd:
+                cmd = StringIO.StringIO()
+            if line.find('--') == 0 and not cmd.getvalue():
+                matched = re.match("--\s*setopt\s+(\S+)\s+(.*)\s*", line)
+                if matched:
+                    if re.match('delim(i(t(e(r)?)?)?)?', matched.group(1)):
+                        delim = matched.group(2)[1:-1]
+                else:
+                    sys.stdout.write(line)
+            else:
+                cmd.write(line)
+                if line.endswith(delim+'\n'):
+                    server.admin(cmd.getvalue()[:(len(delim)+1)*(-1)].replace('\n\n', '\n'))
+                    cmd.close()
+                    cmd = None
+        if cmd and cmd.getvalue():
+            server.admin(cmd.getvalue()[:-len(delim)].replace('\n\n', '\n'))
+            cmd.close
 
 class PythonTest(FuncTest):
     def execute(self, server):
diff --git a/test/memcached/lua.test.lua b/test/memcached/lua.test.lua
new file mode 100644
index 0000000000000000000000000000000000000000..a775fdcb7c06b6f3e4a80d98f8bd3b28a6bb5056
--- /dev/null
+++ b/test/memcached/lua.test.lua
@@ -0,0 +1,5 @@
+box.space[box.cfg.memcached_space].arity
+box.space[box.cfg.memcached_space].estimated_rows
+box.space[box.cfg.memcached_space].n
+box.space[box.cfg.memcached_space].index[0].idx
+box.space[box.cfg.memcached_space].index[0].type
diff --git a/test/memcached/lua.test.py b/test/memcached/lua.test.py
deleted file mode 100644
index d89ae0c5fbf39ea9d5169e38b7a59ebfdba039ba..0000000000000000000000000000000000000000
--- a/test/memcached/lua.test.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# encoding: utf-8
-admin("box.space[box.cfg.memcached_space].arity")
-admin("box.space[box.cfg.memcached_space].estimated_rows")
-admin("box.space[box.cfg.memcached_space].n")
-admin("box.space[box.cfg.memcached_space].index[0].idx")
-admin("box.space[box.cfg.memcached_space].index[0].type")