diff --git a/test/lib/tarantool_preprocessor.py b/test/lib/tarantool_preprocessor.py
index 6a587ed72fabbac4594377108f0f87b1ce89ee99..365bb0eb03670c7ff143b3425cd78716e5460528 100644
--- a/test/lib/tarantool_preprocessor.py
+++ b/test/lib/tarantool_preprocessor.py
@@ -106,10 +106,7 @@ def token_is_operator(token):
 
 
 def token_is_identifier(token):
-    token_type = token[0]
-    if token_type == tokenize.NAME:
-        return True
-    return False
+    return token[0] == tokenize.NAME
 
 
 def token_is_separator(token):
@@ -125,7 +122,7 @@ class TarantoolStreamReader(utf_8.StreamReader):
         try:
             data = tokenize.untokenize(tarantool_translate(self.stream.readline))
             self.stream = cStringIO.StringIO(data)
-        except Exception, e :
+        except Exception:
             self.stream.seek(0)
 
 
diff --git a/test/tarantool b/test/tarantool
index 8e4f72a9ebaa5c0df34e932a8fb0462683ad3770..053f08d3e94f4794d99c4f354f2f50bc2ba5ba4a 100755
--- a/test/tarantool
+++ b/test/tarantool
@@ -69,7 +69,7 @@ class Options:
         default = "tarantool> ",
         help = """Command prompt. Set to "" for no prompt. Default:
         tarantool> """)
-    
+
     self.args = parser.parse_args()
 
 def init_readline_history():
@@ -84,12 +84,12 @@ def init_readline_history():
 
 
 def do_command(admin_con, data_con, line):
-  output = None 
+  output = None
   if is_admin_re.match(line):
-    output = admin_con.execute(line + "\n")
+    output = admin_con.execute(line)
   else:
     output = data_con.execute(line)
-  return output 
+  return output
 
 def main():
   init_readline_history()