diff --git a/test/lib/tarantool_admin.py b/test/lib/tarantool_admin.py
index d144c6af55194da51983e977c13e303728be11c1..4788002c2933f24e16659c7fcd279c2b9a1a67d7 100644
--- a/test/lib/tarantool_admin.py
+++ b/test/lib/tarantool_admin.py
@@ -23,8 +23,11 @@ __author__ = "Konstantin Osipov <kostja.osipov@gmail.com>"
 
 import socket
 import yaml
+import re
 from tarantool_connection import TarantoolConnection
 
+is_admin_re = re.compile("^\s*(show|save|exec|exit|reload|help)", re.I)
+
 class TarantoolAdmin(TarantoolConnection):
   def execute_no_reconnect(self, command, noprint):
     self.socket.sendall(command)
diff --git a/test/tarantool b/test/tarantool
index 0f6c4784f2bb6dba6eb98969464b13f0f7162a59..db8b4c17d63f3ed0277ca8e44297951bef5f62c4 100755
--- a/test/tarantool
+++ b/test/tarantool
@@ -32,8 +32,8 @@ import argparse
 import socket
 import sys
 import string
-from lib.tarantool_connection import AdminConnection, DataConnection, \
-       is_admin_re
+from lib.tarantool_admin import TarantoolAdmin, is_admin_re
+from lib.box import Box
 
 class Options:
   def __init__(self):
@@ -94,8 +94,8 @@ def do_command(admin_con, data_con, line):
 def main():
   init_readline_history()
   options = Options()
-  admin_con = AdminConnection(options.args.host, options.args.admin_port)
-  data_con = DataConnection(options.args.host, options.args.port)
+  admin_con = TarantoolAdmin(options.args.host, options.args.admin_port)
+  data_con = Box(options.args.host, options.args.port)
   try:
     admin_con.connect()
     data_con.connect()