diff --git a/extra/schema_fill.lua b/extra/schema_fill.lua
index 89a5c984ee7dad207b05d35eb7a69170c45ad21e..698c40bd1cd050bd2eadbeb49cbb58a9fae997fd 100644
--- a/extra/schema_fill.lua
+++ b/extra/schema_fill.lua
@@ -50,7 +50,7 @@ _index:insert{_priv.id, 0, 'primary', 'tree', 1, 3, 1, 'num', 2, 'str', 3, 'num'
 -- owner index  - to quickly find all privileges granted to a user
 _index:insert{_priv.id, 1, 'owner', 'tree', 0, 1, 1, 'num'}
 -- object index - to quickly find all grants on a given object
-_index:insert{_priv.id, 2, 'object', 'tree', 0, 1, 2, 'str', 3, 'num'}
+_index:insert{_priv.id, 2, 'object', 'tree', 0, 2, 2, 'str', 3, 'num'}
 -- primary key: node id
 _index:insert{_cluster.id, 0, 'primary', 'tree', 1, 1, 0, 'num'}
 -- node uuid key: node uuid
diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap
index 08cd89aa368cb46a19b7fe52e1aa812db3bf1e1a..01826679a3620c1593c8ccb4aee510b82da0835d 100644
Binary files a/src/box/bootstrap.snap and b/src/box/bootstrap.snap differ
diff --git a/test/box/alter.result b/test/box/alter.result
index 0889df66ed57305a7a77ef055507e2aab448438d..ef6754c69c7a155f917d8534b6702d0597033256 100644
--- a/test/box/alter.result
+++ b/test/box/alter.result
@@ -168,7 +168,7 @@ _index:select{}
   - [304, 2, 'name', 'tree', 1, 1, 2, 'str']
   - [312, 0, 'primary', 'tree', 1, 3, 1, 'num', 2, 'str', 3, 'num']
   - [312, 1, 'owner', 'tree', 0, 1, 1, 'num']
-  - [312, 2, 'object', 'tree', 0, 1, 2, 'str', 3, 'num']
+  - [312, 2, 'object', 'tree', 0, 2, 2, 'str', 3, 'num']
   - [320, 0, 'primary', 'tree', 1, 1, 0, 'num']
   - [320, 1, 'uuid', 'tree', 1, 1, 1, 'str']
 ...
diff --git a/test/lib/app_server.py b/test/lib/app_server.py
index 90be7aa12593198106547185bb767ad3b95a1773..22793a5c80a8b01188ed22b6f9cc13cd83a1c814 100644
--- a/test/lib/app_server.py
+++ b/test/lib/app_server.py
@@ -29,6 +29,10 @@ class AppServer(Server):
         Server.__init__(self, ini)
         self.testdir = os.path.abspath(os.curdir)
         self.vardir = ini['vardir']
+        self.re_vardir_cleanup += [
+            "*.snap", "*.xlog", "*.inprogress",
+            "*.sup", "*.lua", "*.pid"]
+        self.cleanup()
         self.builddir = ini['builddir']
         self.debug = False
         self.lua_libs = ini['lua_libs']