diff --git a/lib/luatest b/lib/luatest
index f31fe34b..cab46b4f 160000
--- a/lib/luatest
+++ b/lib/luatest
@@ -1 +1 @@
-Subproject commit f31fe34bd3030f858b0f042d5484b73249777867
+Subproject commit cab46b4fef88da21bae12e8f17ab61af082b1fa3
diff --git a/lib/server.py b/lib/server.py
index 045543cc..080037bf 100644
--- a/lib/server.py
+++ b/lib/server.py
@@ -35,6 +35,13 @@ class Server(object):
         assert(box.error.injection.set('ERRINJ_AUTO_UPGRADE', true) == 'ok', \
         'no such errinj')"
 
+    # Since the verbose box.error representation contains the diagnostic trace,
+    # it is unsuitable for diff tests, and we disable it from the CLI.
+    DISABLE_BOX_ERROR_SERIALIZE_VERBOSE = \
+        "_, tweaks = pcall(require, 'internal.tweaks') " \
+        "if tweaks ~= nil and tweaks.box_error_serialize_verbose ~= nil then " \
+        "tweaks.box_error_serialize_verbose = false end"
+
     @property
     def vardir(self):
         if not hasattr(self, '_vardir'):
diff --git a/lib/tarantool_server.py b/lib/tarantool_server.py
index a0b213bc..9a4b1292 100644
--- a/lib/tarantool_server.py
+++ b/lib/tarantool_server.py
@@ -839,11 +839,12 @@ def copy_files(self):
             shutil.copy(self.snapshot_path, snapshot_dest)
 
     def prepare_args(self, args=[]):
-        cli_args = [self.ctl_path, 'start',
+        cli_args = [self.binary, '-e', self.DISABLE_BOX_ERROR_SERIALIZE_VERBOSE,
+                    self.ctl_path, 'start',
                     os.path.basename(self.script)] + args
         if self.disable_schema_upgrade:
-            cli_args = [self.binary, '-e',
-                        self.DISABLE_AUTO_UPGRADE] + cli_args
+            cli_args = cli_args[0] + ['-e', self.DISABLE_AUTO_UPGRADE] + \
+                       cli_args[1:]
 
         return cli_args