diff --git a/extra/schema_erase.lua b/extra/schema_erase.lua
index 3593cbb1ae4f3f439bb16ed89990e6009bd17733..8a50d8eaf36d109680fa151145c246ce255e0c1a 100644
--- a/extra/schema_erase.lua
+++ b/extra/schema_erase.lua
@@ -34,3 +34,4 @@ truncate(_user)
 truncate(_func)
 truncate(_priv)
 _schema:delete('version')
+_schema:delete('max_id')
diff --git a/extra/schema_fill.lua b/extra/schema_fill.lua
index 4f1e661966254df2d19cd2f6f6ce626751ef2717..3e414213383969070299383b11f725be21459356 100644
--- a/extra/schema_fill.lua
+++ b/extra/schema_fill.lua
@@ -16,6 +16,7 @@ _priv = box.space[box.schema.PRIV_ID]
 _cluster = box.space[box.schema.CLUSTER_ID]
 -- define schema version
 _schema:insert{'version', 1, 6}
+_schema:insert{'max_id', box.schema.SYSTEM_ID_MAX}
 -- define system spaces
 --
 -- _schema
diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap
index 0ba0e769ecb83b49117c389e1b8454930de62b8e..2b9f7089ecc76f00620f4a524f89bf815a8cff1a 100644
Binary files a/src/box/bootstrap.snap and b/src/box/bootstrap.snap differ
diff --git a/src/box/lua/schema.lua b/src/box/lua/schema.lua
index f20b16e7c1df29b6a36f0e418e72286a2d404ccc..d4dd2afb0e6895a35c16bf07ee070b855ae8f9ff 100644
--- a/src/box/lua/schema.lua
+++ b/src/box/lua/schema.lua
@@ -240,12 +240,16 @@ box.schema.space.create = function(name, options)
     end
     local id = options.id
     if not id then
-        id = _space.index[0]:max()[1]
-        if id < box.schema.SYSTEM_ID_MAX then
-            id = box.schema.SYSTEM_ID_MAX + 1
-        else
-            id = id + 1
+        local _schema = box.space._schema
+        local max_id = _schema:update({'max_id'}, {{'+', 2, 1}})
+        if max_id == nil then
+            id = _space.index.primary:max()[1]
+            if id < box.schema.SYSTEM_ID_MAX then
+                id = box.schema.SYSTEM_ID_MAX
+            end
+            max_id = _schema:insert{'max_id', id + 1}
         end
+        id = max_id[2]
     end
     local uid = nil
     if options.user then
diff --git a/test/big/iterator.result b/test/big/iterator.result
index a732597298dbeda00fad536a48d33c30db090ada..e99619bcdaf8ed434ea1578c6299c65d036d4dfa 100644
--- a/test/big/iterator.result
+++ b/test/big/iterator.result
@@ -900,9 +900,12 @@ gen, param, state = space.index['i1']:pairs(nil, { iterator = box.index.GE })
 index_space = box.space[box.schema.INDEX_ID]
 ---
 ...
-index_space:delete{space.id, space.index['i1'].id}
+_ = index_space:delete{space.id, space.index['i1'].id}
 ---
-- [512, 1, 'i1', 'tree', 0, 1, 1, 'str']
+...
+type(_)
+---
+- cdata
 ...
 gen(param, state)
 ---
diff --git a/test/big/iterator.test.lua b/test/big/iterator.test.lua
index f54914b6edd3428510172b70af989dc9ac70dc22..19068ba142c1833a3df28f648db431e07e60c620 100644
--- a/test/big/iterator.test.lua
+++ b/test/big/iterator.test.lua
@@ -165,7 +165,8 @@ space.index['primary']:pairs(function() end, { iterator = box.index.EQ })
 -- Check that iterators successfully invalidated when index deleted
 gen, param, state = space.index['i1']:pairs(nil, { iterator = box.index.GE })
 index_space = box.space[box.schema.INDEX_ID]
-index_space:delete{space.id, space.index['i1'].id}
+_ = index_space:delete{space.id, space.index['i1'].id}
+type(_)
 gen(param, state)
 
 space:drop()
diff --git a/test/box/access.result b/test/box/access.result
index ca466247cd93ee44741f7ce77c273ae63aaf36ad..de50fc73379b0322770745babd17f0108280d9b1 100644
--- a/test/box/access.result
+++ b/test/box/access.result
@@ -46,7 +46,7 @@ session.su('test')
 -- in future we may  introduce a separate privilege
 box.schema.create_space('test')
 ---
-- error: Read access denied for user 'test' to space '_space'
+- error: Write access denied for user 'test' to space '_schema'
 ...
 -- su() goes through because called from admin
 -- console, and it has no access checks
@@ -394,7 +394,7 @@ box.schema.user.passwd('invalid_user', 'some_password')
 ...
 box.schema.user.passwd()
 ---
-- error: '[string "-- schema.lua (internal file)..."]:1043: Usage: box.schema.user.passwd([user,]
+- error: '[string "-- schema.lua (internal file)..."]:1047: Usage: box.schema.user.passwd([user,]
     password)'
 ...
 session.su('user1')
diff --git a/test/box/access_misc.result b/test/box/access_misc.result
index 35c5509b940fb21e6c6ee9d66f7be87381e72e47..377b136aecea5c8d2f3358fa9d2e6293804c2583 100644
--- a/test/box/access_misc.result
+++ b/test/box/access_misc.result
@@ -19,7 +19,7 @@ s:drop()
 ...
 s:drop()
 ---
-- error: Space '#512' does not exist
+- error: Space '#518' does not exist
 ...
 --
 -- Check double create user
@@ -167,7 +167,7 @@ s:drop()
 ...
 gs = box.schema.create_space('guest_space')
 ---
-- error: Read access denied for user 'guest' to space '_space'
+- error: Write access denied for user 'guest' to space '_schema'
 ...
 box.schema.func.create('guest_func')
 ---
diff --git a/test/box/alter_limits.result b/test/box/alter_limits.result
index 293212936277c131bdbc75d2a2ce19696d1eaa66..c87677d5cf7b22136629f065a84b0e37ea53be5a 100644
--- a/test/box/alter_limits.result
+++ b/test/box/alter_limits.result
@@ -66,7 +66,7 @@ s:drop()
 -- no such space
 s:drop()
 ---
-- error: Space '#512' does not exist
+- error: Space '#738' does not exist
 ...
 -- no such engine
 box.schema.create_space('tweedleedee', { engine = 'unknown' })
@@ -278,7 +278,7 @@ box.space['_space']:update(s.id, {{"=", FIELD_COUNT + 1, 1}})
 -- remove field_count - ok
 box.space['_space']:update(s.id, {{"=", FIELD_COUNT + 1, 0}})
 ---
-- [512, 1, 'test', 'memtx', 0, '', []]
+- [746, 1, 'test', 'memtx', 0, '', []]
 ...
 s:select{}
 ---
@@ -300,7 +300,7 @@ s:select{}
 -- set field_count of an empty space
 box.space['_space']:update(s.id, {{"=", FIELD_COUNT + 1, 3}})
 ---
-- [512, 1, 'test', 'memtx', 3, '', []]
+- [746, 1, 'test', 'memtx', 3, '', []]
 ...
 s:select{}
 ---
@@ -656,7 +656,7 @@ s.index.primary
   - type: NUM
     fieldno: 1
   id: 0
-  space_id: 512
+  space_id: 751
   name: primary
   type: HASH
 ...
@@ -788,7 +788,7 @@ s.index.primary:select{}
 ...
 box.space['_index']:update({s.id, s.index.year.id}, {{"=", 8, 'num'}})
 ---
-- [512, 1, 'year', 'tree', 0, 1, 1, 'num']
+- [752, 1, 'year', 'tree', 0, 1, 1, 'num']
 ...
 -- ambiguous field type
 index = s:create_index('str', { type = 'tree', unique =  false, parts = { 2, 'str'}})
diff --git a/test/box/bootstrap.result b/test/box/bootstrap.result
index 8e55683e96d180ea8546658ce7c730aef9531af6..74f8dc32c39f41eaf26679196e1096adf30e93e5 100644
--- a/test/box/bootstrap.result
+++ b/test/box/bootstrap.result
@@ -39,6 +39,7 @@ box.snapshot()
 box.space._schema:select{}
 ---
 - - ['cluster', '<cluster uuid>']
+  - ['max_id', 511]
   - ['version', 1, 6]
 ...
 box.space._cluster:select{}
diff --git a/test/box/errinj.result b/test/box/errinj.result
index 5435850f509c716131f38889df07223bbec5de1c..9a8546a35fe263510a001fa64092dc718074d8b8 100644
--- a/test/box/errinj.result
+++ b/test/box/errinj.result
@@ -271,7 +271,7 @@ box.space['withdata']
 ...
 index7 = s_withdata:create_index('another', { type = 'tree', parts = { 5, 'num' }, unique = false})
 ---
-- error: Space '514' does not exist
+- error: Space '766' does not exist
 ...
 s_withdata.index.another
 ---
diff --git a/test/box/net.box.result b/test/box/net.box.result
index 8332b9f2d6bb74869089959e56ca5b75c0b31746..43f18b5387d451cf9df2e686d33c8bc883a5fae7 100644
--- a/test/box/net.box.result
+++ b/test/box/net.box.result
@@ -759,16 +759,8 @@ gh594()
 sp = box.schema.create_space('test_old')
 ---
 ...
-sp:create_index('primary')
+_ = sp:create_index('primary')
 ---
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 512
-  name: primary
-  type: TREE
 ...
 sp:insert{1, 2, 3}
 ---
@@ -792,16 +784,8 @@ con.space.test == nil
 sp = box.schema.create_space('test')
 ---
 ...
-sp:create_index('primary')
+_ = sp:create_index('primary')
 ---
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 513
-  name: primary
-  type: TREE
 ...
 sp:insert{2, 3, 4}
 ---
diff --git a/test/box/net.box.test.lua b/test/box/net.box.test.lua
index 7ca86771f5916c7961eeb13a0269dbbc039fc9f7..d14fc4e7a34cc17d66f77ff7f7ec867f36110ab5 100644
--- a/test/box/net.box.test.lua
+++ b/test/box/net.box.test.lua
@@ -297,7 +297,7 @@ gh594()
 
 -- #636: Reload schema on demand
 sp = box.schema.create_space('test_old')
-sp:create_index('primary')
+_ = sp:create_index('primary')
 sp:insert{1, 2, 3}
 
 con = remote.new(box.cfg.listen)
@@ -306,7 +306,7 @@ con.space.test_old:select{}
 con.space.test == nil
 
 sp = box.schema.create_space('test')
-sp:create_index('primary')
+_ = sp:create_index('primary')
 sp:insert{2, 3, 4}
 
 con.space.test == nil
diff --git a/test/box/role.result b/test/box/role.result
index 1f672423e332b6ae2f4f9b0a4ebfd1e1def8d24c..5e4ef6d6c070bd1dd0899c42d544c33f3728cb16 100644
--- a/test/box/role.result
+++ b/test/box/role.result
@@ -191,16 +191,8 @@ box.session.su('test')
 s = box.schema.space.create('test')
 ---
 ...
-s:create_index('i1')
----
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 512
-  name: i1
-  type: TREE
+_ = s:create_index('i1')
+---
 ...
 box.schema.role.grant('liaison', 'read,write', 'space', 'test')
 ---
diff --git a/test/box/role.test.lua b/test/box/role.test.lua
index 7425918d7896dea72dc53d751f362571325a8920..6036c3d587cabcc5a42f4ce8be444fc55848fc5c 100644
--- a/test/box/role.test.lua
+++ b/test/box/role.test.lua
@@ -60,7 +60,7 @@ box.schema.user.grant('grantee', 'liaison')
 box.schema.user.grant('test', 'read,write', 'universe')
 box.session.su('test')
 s = box.schema.space.create('test')
-s:create_index('i1')
+_ = s:create_index('i1')
 box.schema.role.grant('liaison', 'read,write', 'space', 'test')
 box.session.su('grantee')
 box.space.test:insert{1}
diff --git a/test/box/rtree_array.result b/test/box/rtree_array.result
index e58a1b45aeadd41caa6edc757bfb44b233dcd870..f3fcee570b5c310cbf43b4cdad867f5757afdd69 100644
--- a/test/box/rtree_array.result
+++ b/test/box/rtree_array.result
@@ -1,27 +1,15 @@
 s = box.schema.create_space('spatial')
 ---
 ...
-s:create_index('primary')
----
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 512
-  name: primary
-  type: TREE
-...
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
----
-- unique: false
-  parts:
-  - type: ARRAY
-    fieldno: 2
-  id: 1
-  space_id: 512
-  name: spatial
-  type: RTREE
+_ = s:create_index('primary')
+---
+...
+spatial = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+---
+...
+spatial.type
+---
+- RTREE
 ...
 s:insert{1,{0.0,0.0}}
 ---
diff --git a/test/box/rtree_array.test.lua b/test/box/rtree_array.test.lua
index 1dcecac280e68d8e0d5b02bba4d7e9534b1d9b69..4ad495849bcc34b1973f121d0b4b847a160e2e5a 100644
--- a/test/box/rtree_array.test.lua
+++ b/test/box/rtree_array.test.lua
@@ -1,6 +1,8 @@
 s = box.schema.create_space('spatial')
-s:create_index('primary')
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+_ = s:create_index('primary')
+spatial = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+
+spatial.type
 
 s:insert{1,{0.0,0.0}}
 s:insert{2,{0.0,10.0}}
diff --git a/test/box/rtree_point.result b/test/box/rtree_point.result
index c011d852ff01c241c55cfa55efb9f7a13d578ff2..a138f14ed51f11b24529a1f20c1937acd31d818e 100644
--- a/test/box/rtree_point.result
+++ b/test/box/rtree_point.result
@@ -1,27 +1,11 @@
 s = box.schema.create_space('spatial')
 ---
 ...
-s:create_index('primary')
----
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 512
-  name: primary
-  type: TREE
-...
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
----
-- unique: false
-  parts:
-  - type: ARRAY
-    fieldno: 2
-  id: 1
-  space_id: 512
-  name: spatial
-  type: RTREE
+_ = s:create_index('primary')
+---
+...
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+---
 ...
 s:insert{1,{0,0}}
 ---
diff --git a/test/box/rtree_point.test.lua b/test/box/rtree_point.test.lua
index 394a23a5d48d76b99accd906ba229004b93c85e8..7c2f2757f41e35927e3b46ce75035ca1fd636ddc 100644
--- a/test/box/rtree_point.test.lua
+++ b/test/box/rtree_point.test.lua
@@ -1,6 +1,6 @@
 s = box.schema.create_space('spatial')
-s:create_index('primary')
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+_ = s:create_index('primary')
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
 s:insert{1,{0,0}}
 s:insert{2,{0,10}}
diff --git a/test/box/rtree_point_r2.result b/test/box/rtree_point_r2.result
index e58a1b45aeadd41caa6edc757bfb44b233dcd870..87f59e9c9227d7396cefb9b629000bc5eb5d44c4 100644
--- a/test/box/rtree_point_r2.result
+++ b/test/box/rtree_point_r2.result
@@ -1,27 +1,11 @@
 s = box.schema.create_space('spatial')
 ---
 ...
-s:create_index('primary')
----
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 512
-  name: primary
-  type: TREE
-...
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
----
-- unique: false
-  parts:
-  - type: ARRAY
-    fieldno: 2
-  id: 1
-  space_id: 512
-  name: spatial
-  type: RTREE
+_ = s:create_index('primary')
+---
+...
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+---
 ...
 s:insert{1,{0.0,0.0}}
 ---
diff --git a/test/box/rtree_point_r2.test.lua b/test/box/rtree_point_r2.test.lua
index 1dcecac280e68d8e0d5b02bba4d7e9534b1d9b69..0a31020231fff12814741a0647619cd56074f15f 100644
--- a/test/box/rtree_point_r2.test.lua
+++ b/test/box/rtree_point_r2.test.lua
@@ -1,6 +1,6 @@
 s = box.schema.create_space('spatial')
-s:create_index('primary')
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+_ = s:create_index('primary')
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
 s:insert{1,{0.0,0.0}}
 s:insert{2,{0.0,10.0}}
diff --git a/test/box/rtree_rect.result b/test/box/rtree_rect.result
index c4ee5637cb9b62f4cb3413537e57e38fe1cf8132..47b8810d3c7329ad44486a5f0dfc0468784450a2 100644
--- a/test/box/rtree_rect.result
+++ b/test/box/rtree_rect.result
@@ -1,27 +1,11 @@
 s = box.schema.create_space('spatial')
 ---
 ...
-s:create_index('primary')
----
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 512
-  name: primary
-  type: TREE
-...
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
----
-- unique: false
-  parts:
-  - type: ARRAY
-    fieldno: 2
-  id: 1
-  space_id: 512
-  name: spatial
-  type: RTREE
+_ = s:create_index('primary')
+---
+...
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+---
 ...
 s:insert{1,{0,0,10,10}{
 ---
diff --git a/test/box/rtree_rect.test.lua b/test/box/rtree_rect.test.lua
index 3580985e397786e485250532b46c0f4f45ef5083..96343a512be90e6e063990c69df9e847402fd29f 100644
--- a/test/box/rtree_rect.test.lua
+++ b/test/box/rtree_rect.test.lua
@@ -1,6 +1,6 @@
 s = box.schema.create_space('spatial')
-s:create_index('primary')
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+_ = s:create_index('primary')
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
 s:insert{1,{0,0,10,10}{
 s:insert{2,{5,5,10,10}}
diff --git a/test/box/stat.result b/test/box/stat.result
index 573b5b2cf6ebf3b37ca94a6ffa0c107d88ab85ef..b54176e0e539b6d0eb2aa9d43c5e1e35e23cc26b 100644
--- a/test/box/stat.result
+++ b/test/box/stat.result
@@ -42,7 +42,7 @@ box.stat.DELETE.total
 ...
 box.stat.UPDATE.total
 ---
-- 0
+- 1
 ...
 box.stat.REPLACE.total
 ---
@@ -50,7 +50,7 @@ box.stat.REPLACE.total
 ...
 box.stat.SELECT.total
 ---
-- 3
+- 2
 ...
 --# stop server default
 --# start server default
diff --git a/test/box/temp_spaces.result b/test/box/temp_spaces.result
index 5b35565bb95147edd4e998ff393adfb1cb99b003..f2701e632d93120ad2693b579cf22313b2163c65 100644
--- a/test/box/temp_spaces.result
+++ b/test/box/temp_spaces.result
@@ -1,4 +1,7 @@
 -- temporary spaces
+_space = box.space._space
+---
+...
 -- not a temporary
 FLAGS = 6
 ---
@@ -53,20 +56,30 @@ s:len()
 ---
 - 1
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'temporary'}})
+---
+...
+s.temporary
 ---
-- [512, 1, 't', 'memtx', 0, 'temporary', []]
+- true
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, ''}})
+_ = _space:update(s.id, {{'=', FLAGS, ''}})
 ---
 - error: 'Can''t modify space ''t'': can not switch temporary flag on a non-empty
     space'
 ...
+s.temporary
+---
+- true
+...
 --# stop server default
 --# start server default
 FLAGS = 6
 ---
 ...
+_space = box.space._space
+---
+...
 s = box.space.t
 ---
 ...
@@ -78,33 +91,29 @@ s.temporary
 ---
 - true
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'no-temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'no-temporary'}})
 ---
-- [512, 1, 't', 'memtx', 0, 'no-temporary', []]
 ...
 s.temporary
 ---
 - false
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, ',:asfda:temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, ',:asfda:temporary'}})
 ---
-- [512, 1, 't', 'memtx', 0, ',:asfda:temporary', []]
 ...
 s.temporary
 ---
 - false
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'a,b,c,d,e'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'a,b,c,d,e'}})
 ---
-- [512, 1, 't', 'memtx', 0, 'a,b,c,d,e', []]
 ...
 s.temporary
 ---
 - false
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'temporary'}})
 ---
-- [512, 1, 't', 'memtx', 0, 'temporary', []]
 ...
 s.temporary
 ---
@@ -117,22 +126,28 @@ s:insert{1, 2, 3}
 ---
 - [1, 2, 3]
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'temporary'}})
+---
+...
+s.temporary
 ---
-- [512, 1, 't', 'memtx', 0, 'temporary', []]
+- true
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'no-temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'no-temporary'}})
 ---
 - error: 'Can''t modify space ''t'': can not switch temporary flag on a non-empty
     space'
 ...
+s.temporary
+---
+- true
+...
 s:delete{1}
 ---
 - [1, 2, 3]
 ...
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'no-temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'no-temporary'}})
 ---
-- [512, 1, 't', 'memtx', 0, 'no-temporary', []]
 ...
 s:drop()
 ---
diff --git a/test/box/temp_spaces.test.lua b/test/box/temp_spaces.test.lua
index bc4961a90415b649d623c9aa9ce8f4e1ab453d86..17a8a5383dc798810b840626707ea5cc3d1c734b 100644
--- a/test/box/temp_spaces.test.lua
+++ b/test/box/temp_spaces.test.lua
@@ -1,4 +1,5 @@
 -- temporary spaces
+_space = box.space._space
 -- not a temporary
 FLAGS = 6
 s = box.schema.create_space('t', { temporary = true })
@@ -22,32 +23,37 @@ s:insert{1, 2, 3}
 s:get{1}
 s:len()
 
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'temporary'}})
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, ''}})
+_ = _space:update(s.id, {{'=', FLAGS, 'temporary'}})
+s.temporary
+_ = _space:update(s.id, {{'=', FLAGS, ''}})
+s.temporary
 
 --# stop server default
 --# start server default
 FLAGS = 6
+_space = box.space._space
 
 s = box.space.t
 s:len()
 s.temporary
 
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'no-temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'no-temporary'}})
 s.temporary
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, ',:asfda:temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, ',:asfda:temporary'}})
 s.temporary
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'a,b,c,d,e'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'a,b,c,d,e'}})
 s.temporary
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'temporary'}})
 s.temporary
 
 s:get{1}
 s:insert{1, 2, 3}
 
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'temporary'}})
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'no-temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'temporary'}})
+s.temporary
+_ = _space:update(s.id, {{'=', FLAGS, 'no-temporary'}})
+s.temporary
 
 s:delete{1}
-box.space[box.schema.SPACE_ID]:update(s.id, {{'=', FLAGS, 'no-temporary'}})
+_ = _space:update(s.id, {{'=', FLAGS, 'no-temporary'}})
 s:drop()
diff --git a/test/box/transaction.result b/test/box/transaction.result
index 6cfc1893e80a4d33b02a17f28b29ef46f8bf0d42..0b5ae919a47b131090e704c1aae02122dc2979e1 100644
--- a/test/box/transaction.result
+++ b/test/box/transaction.result
@@ -64,7 +64,7 @@ f:status();
 -- transactions and system spaces
 box.begin() box.schema.space.create('test');
 ---
-- error: Space _space does not support multi-statement transactions
+- error: Space _schema does not support multi-statement transactions
 ...
 box.rollback();
 ---
diff --git a/test/wal/rtree_benchmark.result b/test/wal/rtree_benchmark.result
index 3e9256577421aa52c5e878d61153a154d9dd8c9d..5ea134ef6979b27c6d8890dfdb040222b34f2a53 100644
--- a/test/wal/rtree_benchmark.result
+++ b/test/wal/rtree_benchmark.result
@@ -1,27 +1,11 @@
 s = box.schema.create_space('rtreebench')
 ---
 ...
-s:create_index('primary')
----
-- unique: true
-  parts:
-  - type: NUM
-    fieldno: 1
-  id: 0
-  space_id: 512
-  name: primary
-  type: TREE
-...
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
----
-- unique: false
-  parts:
-  - type: ARRAY
-    fieldno: 2
-  id: 1
-  space_id: 512
-  name: spatial
-  type: RTREE
+_ = s:create_index('primary')
+---
+...
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+---
 ...
 n_records = 20000
 ---
diff --git a/test/wal/rtree_benchmark.test.lua b/test/wal/rtree_benchmark.test.lua
index 07db874218197ec656a267372b526abae0784a5e..34c2a8a3d4da4aed5873b7e53d62e9dabb690245 100644
--- a/test/wal/rtree_benchmark.test.lua
+++ b/test/wal/rtree_benchmark.test.lua
@@ -1,6 +1,6 @@
 s = box.schema.create_space('rtreebench')
-s:create_index('primary')
-s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
+_ = s:create_index('primary')
+_ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
 n_records = 20000
 n_iterations = 10000