diff --git a/test/lib/preprocessor.py b/test/lib/preprocessor.py
index ca979a41b987f2aadba58f0cd84dca3130478efd..8f536568d0ea86a77069ac872f2a369539dbf712 100644
--- a/test/lib/preprocessor.py
+++ b/test/lib/preprocessor.py
@@ -24,7 +24,7 @@ class TestState(object):
         self.delimiter = ''
         self.suite_ini = suite_ini
         self.environ = Namespace()
-        self.create_server = create_server 
+        self.create_server = create_server
         self.servers =      { 'default': default_server }
         self.connections =  { 'default': default_server.admin }
         # curcon is an array since we may have many connections
@@ -164,12 +164,13 @@ class TestState(object):
             self.connections.pop(sname)
             self.servers[sname].stop()
         elif ctype == 'deploy':
-            pass
+            self.servers[sname].deploy()
         elif ctype == 'cleanup':
             if sname not in self.servers:
                 raise LuaPreprocessorException('Can\'t cleanup nonexistent server '+repr(sname))
             self.servers[sname].cleanup()
-            delattr(self.environ, sname)
+            if sname != 'default':
+                delattr(self.environ, sname)
         else:
             raise LuaPreprocessorException('Unknown command for server: '+repr(ctype))
 
diff --git a/test/replication/hot_standby.result b/test/replication/hot_standby.result
index db5c16770d21238ef6e39f1f89d44fe984f41b32..65676c970e8ca4bc47d827bf854fb6ac33a1e5fb 100644
--- a/test/replication/hot_standby.result
+++ b/test/replication/hot_standby.result
@@ -190,8 +190,6 @@ _select(11, 20)
 --# stop server replica
 --# cleanup server hot_standby
 --# cleanup server replica
+--# deploy server default
 --# start server default
 --# set connection default
-box.space['tweedledum']:drop()
----
-...
diff --git a/test/replication/hot_standby.test.lua b/test/replication/hot_standby.test.lua
index 8acb7ebdff1e7903ebdb3074051b59b3fa5d48f2..e52f915b86fa06c02bfd5b890db023638db34a42 100644
--- a/test/replication/hot_standby.test.lua
+++ b/test/replication/hot_standby.test.lua
@@ -94,6 +94,6 @@ _select(11, 20)
 --# stop server replica
 --# cleanup server hot_standby
 --# cleanup server replica
+--# deploy server default
 --# start server default
 --# set connection default
-box.space['tweedledum']:drop()