diff --git a/test/box/admin.result b/test/box/admin.result
index ce03541fb1f1d5e67f5905e5a6667690b8dfc0ad..bd184b122aff15f7ce27fae3f4727a1c7617eb46 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -1,9 +1,9 @@
 --# stop server default
 --# start server default
-space = box.schema.space.create('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum')
 ---
 ...
-index = space:create_index('primary', { type = 'hash' })
+index = space:create_index('primary')
 ---
 ...
 --# push filter 'listen: .*' to 'listen: <uri>'
diff --git a/test/box/admin.test.lua b/test/box/admin.test.lua
index 98a4b16f6d31d7f2ac7ad252335895127696de9c..4c82e3dae122a6c8e988e3e6ecf5ee3af6de5a8e 100644
--- a/test/box/admin.test.lua
+++ b/test/box/admin.test.lua
@@ -1,8 +1,8 @@
 --# stop server default
 --# start server default
 
-space = box.schema.space.create('tweedledum', { id = 0 })
-index = space:create_index('primary', { type = 'hash' })
+space = box.schema.space.create('tweedledum')
+index = space:create_index('primary')
 
 --# push filter 'listen: .*' to 'listen: <uri>'
 help()
diff --git a/test/box/reconfigure.result b/test/box/reconfigure.result
index fbed002b409ca5f1480a56e2f27f73447114ee1c..d0fcabd95cd1c648e3df678d757697c176e117a1 100644
--- a/test/box/reconfigure.result
+++ b/test/box/reconfigure.result
@@ -33,10 +33,10 @@ box.cfg.io_collect_interval
 -- Valgrind reports use of not initialized memory after 'reload
 -- configuration'
 --
-space = box.schema.space.create('tweedledum', { id = 0 })
+space = box.schema.space.create('tweedledum')
 ---
 ...
-index = space:create_index('primary', { type = 'hash'})
+index = space:create_index('primary')
 ---
 ...
 space:insert{1, 'tuple'}
diff --git a/test/box/reconfigure.test.lua b/test/box/reconfigure.test.lua
index da3968288a7a2dfda99ef7784b8c949dbfe65213..0ba0a64e5f0e4508d7ac6e1d7f2bbb00bb1ab7e2 100644
--- a/test/box/reconfigure.test.lua
+++ b/test/box/reconfigure.test.lua
@@ -13,8 +13,8 @@ box.cfg.io_collect_interval
 -- Valgrind reports use of not initialized memory after 'reload
 -- configuration'
 --
-space = box.schema.space.create('tweedledum', { id = 0 })
-index = space:create_index('primary', { type = 'hash'})
+space = box.schema.space.create('tweedledum')
+index = space:create_index('primary')
 space:insert{1, 'tuple'}
 box.snapshot()
 box.cfg{}
diff --git a/test/wal/alter.result b/test/wal_off/alter.result
similarity index 88%
rename from test/wal/alter.result
rename to test/wal_off/alter.result
index 4ff8a354729c9ff2a100242aff4efd4e0612facf..8c96667dd6e8447b65e77b89482249669bed29d6 100644
--- a/test/wal/alter.result
+++ b/test/wal_off/alter.result
@@ -9,7 +9,7 @@ box.schema.FORMAT_ID_MAX
 --# setopt delimiter ';'
 -- too many formats
 for k = 1, box.schema.FORMAT_ID_MAX, 1 do
-    local s = box.schema.create_space('space'..k)
+    local s = box.schema.space.create('space'..k)
     table.insert(spaces, s)
 end;
 ---
diff --git a/test/wal/alter.test.lua b/test/wal_off/alter.test.lua
similarity index 85%
rename from test/wal/alter.test.lua
rename to test/wal_off/alter.test.lua
index d9f5430c6ed68be6310aa355952bdff510d51831..fa16b826a815a0d66325ff529bf3f50a17aece0b 100644
--- a/test/wal/alter.test.lua
+++ b/test/wal_off/alter.test.lua
@@ -4,7 +4,7 @@ box.schema.FORMAT_ID_MAX
 --# setopt delimiter ';'
 -- too many formats
 for k = 1, box.schema.FORMAT_ID_MAX, 1 do
-    local s = box.schema.create_space('space'..k)
+    local s = box.schema.space.create('space'..k)
     table.insert(spaces, s)
 end;
 #spaces;
diff --git a/test/wal/func_max.result b/test/wal_off/func_max.result
similarity index 100%
rename from test/wal/func_max.result
rename to test/wal_off/func_max.result
diff --git a/test/wal/func_max.test.lua b/test/wal_off/func_max.test.lua
similarity index 100%
rename from test/wal/func_max.test.lua
rename to test/wal_off/func_max.test.lua
diff --git a/test/wal/lua.result b/test/wal_off/lua.result
similarity index 94%
rename from test/wal/lua.result
rename to test/wal_off/lua.result
index 07d561f99873b4ec8938e9a6e8c87fd05f92d52a..7b1af439d60e0fe7de183291c003ceddbe701355 100644
--- a/test/wal/lua.result
+++ b/test/wal_off/lua.result
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index1 = space:create_index('primary', { type ='hash', parts = {1, 'str'}, unique = true })
@@ -47,7 +47,7 @@ space:drop()
 -- A test case for https://github.com/tarantool/tarantool/issues/65
 -- Space does not exist error on repetitive access to space 0 in Lua
 --
-space = box.schema.create_space('tweedledum', {id=0})
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal/lua.test.lua b/test/wal_off/lua.test.lua
similarity index 93%
rename from test/wal/lua.test.lua
rename to test/wal_off/lua.test.lua
index 28b6e29752602cc73e8ceb5e3064137cf334e975..459c5f521ac989a4a3142a465e2ee8ac3096a8e4 100644
--- a/test/wal/lua.test.lua
+++ b/test/wal_off/lua.test.lua
@@ -1,4 +1,4 @@
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index1 = space:create_index('primary', { type ='hash', parts = {1, 'str'}, unique = true })
 index2 = space:create_index('secondary', { type = 'tree', parts = {2, 'num'}, unique = false })
 -- A test case for Bug#1042738
@@ -34,7 +34,7 @@ space:drop()
 -- A test case for https://github.com/tarantool/tarantool/issues/65
 -- Space does not exist error on repetitive access to space 0 in Lua
 --
-space = box.schema.create_space('tweedledum', {id=0})
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 
 --# setopt delimiter ';'
diff --git a/test/wal/oom.result b/test/wal_off/oom.result
similarity index 99%
rename from test/wal/oom.result
rename to test/wal_off/oom.result
index 6300cf178a59e12ed075ccb6e02e3652bff4c1d0..d029f0225265480aef57dafc68812c0fddc0686e 100644
--- a/test/wal/oom.result
+++ b/test/wal_off/oom.result
@@ -1,6 +1,6 @@
 --# stop server default
 --# start server default
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal/oom.test.lua b/test/wal_off/oom.test.lua
similarity index 95%
rename from test/wal/oom.test.lua
rename to test/wal_off/oom.test.lua
index 160390a8c5770bb661bbcf2a3d4d6e8054eaf83a..03b58728e7be3de23715ecd53da324835ab51657 100644
--- a/test/wal/oom.test.lua
+++ b/test/wal_off/oom.test.lua
@@ -1,6 +1,6 @@
 --# stop server default
 --# start server default
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 --# setopt delimiter ';'
 i = 1;
diff --git a/test/wal/rtree_benchmark.result b/test/wal_off/rtree_benchmark.result
similarity index 97%
rename from test/wal/rtree_benchmark.result
rename to test/wal_off/rtree_benchmark.result
index 5ea134ef6979b27c6d8890dfdb040222b34f2a53..c4b4c4071fa0c8d972039698252638f3a1d6c946 100644
--- a/test/wal/rtree_benchmark.result
+++ b/test/wal_off/rtree_benchmark.result
@@ -1,4 +1,4 @@
-s = box.schema.create_space('rtreebench')
+s = box.schema.space.create('rtreebench')
 ---
 ...
 _ = s:create_index('primary')
diff --git a/test/wal/rtree_benchmark.test.lua b/test/wal_off/rtree_benchmark.test.lua
similarity index 97%
rename from test/wal/rtree_benchmark.test.lua
rename to test/wal_off/rtree_benchmark.test.lua
index 34c2a8a3d4da4aed5873b7e53d62e9dabb690245..37dec0fda2a2b0771a2c278d1eea19acb1810418 100644
--- a/test/wal/rtree_benchmark.test.lua
+++ b/test/wal_off/rtree_benchmark.test.lua
@@ -1,4 +1,4 @@
-s = box.schema.create_space('rtreebench')
+s = box.schema.space.create('rtreebench')
 _ = s:create_index('primary')
 _ = s:create_index('spatial', { type = 'rtree', unique = false, parts = {2, 'array'}})
 
diff --git a/test/wal/suite.ini b/test/wal_off/suite.ini
similarity index 100%
rename from test/wal/suite.ini
rename to test/wal_off/suite.ini
diff --git a/test/wal/tuple.result b/test/wal_off/tuple.result
similarity index 94%
rename from test/wal/tuple.result
rename to test/wal_off/tuple.result
index 26d6507f8f4c82b30899c4073c49e5950781ff1f..e6e13f54b82ed1f8130dfaa6307818343717cf8a 100644
--- a/test/wal/tuple.result
+++ b/test/wal_off/tuple.result
@@ -7,7 +7,7 @@
 -- gh-372 Assertion with a function that inserts increasingly
 -- large tables
 -- -------------------------------------------------------
-tester = box.schema.create_space('tester')
+tester = box.schema.space.create('tester')
 ---
 ...
 index = tester:create_index('primary',{})
diff --git a/test/wal/tuple.test.lua b/test/wal_off/tuple.test.lua
similarity index 93%
rename from test/wal/tuple.test.lua
rename to test/wal_off/tuple.test.lua
index 9965eb3090209d49cb45a183cd9efd380526eb3d..c0d0697d66430477ab09c2e830f7614b9765d212 100644
--- a/test/wal/tuple.test.lua
+++ b/test/wal_off/tuple.test.lua
@@ -7,7 +7,7 @@
 -- gh-372 Assertion with a function that inserts increasingly
 -- large tables
 -- -------------------------------------------------------
-tester = box.schema.create_space('tester')
+tester = box.schema.space.create('tester')
 index = tester:create_index('primary',{})
 --# setopt delimiter ';'
 function tuple_max()
diff --git a/test/wal/wal.lua b/test/wal_off/wal.lua
similarity index 100%
rename from test/wal/wal.lua
rename to test/wal_off/wal.lua
diff --git a/test/wal/wal_mode.result b/test/wal_off/wal_mode.result
similarity index 92%
rename from test/wal/wal_mode.result
rename to test/wal_off/wal_mode.result
index 07f5870879612415504e5c7d1bc42767220c85bc..9ca59bbc605a8b6331347f88a862712407a22f7b 100644
--- a/test/wal/wal_mode.result
+++ b/test/wal_off/wal_mode.result
@@ -2,7 +2,7 @@ box.cfg.wal_mode
 ---
 - none
 ...
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 ---
 ...
 index = space:create_index('primary', { type = 'hash' })
diff --git a/test/wal/wal_mode.test.lua b/test/wal_off/wal_mode.test.lua
similarity index 87%
rename from test/wal/wal_mode.test.lua
rename to test/wal_off/wal_mode.test.lua
index 14a022b3f97e19b350edb1f1a3e2bbaa2c11a0f7..6ff4b06548bee79d07f85f473ac99b9b9fee61b5 100644
--- a/test/wal/wal_mode.test.lua
+++ b/test/wal_off/wal_mode.test.lua
@@ -1,5 +1,5 @@
 box.cfg.wal_mode
-space = box.schema.create_space('tweedledum')
+space = box.schema.space.create('tweedledum')
 index = space:create_index('primary', { type = 'hash' })
 space:insert{1}
 space:insert{2}