diff --git a/sbroad-cartridge/test_app/test/integration/groupby_test.lua b/sbroad-cartridge/test_app/test/integration/groupby_test.lua
index 5ef8f64d205efd1ce7933d33b5aa1efe8c92c6ca..f5ec1f34aa65786cdc15d42347098745b7e7d043 100644
--- a/sbroad-cartridge/test_app/test/integration/groupby_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/groupby_test.lua
@@ -1,6 +1,5 @@
 local t = require('luatest')
 local groupby_queries = t.group('groupby_queries')
-
 local helper = require('test.helper.cluster_no_replication')
 local cluster = nil
 
@@ -328,7 +327,7 @@ groupby_queries.test_with_selection = function ()
     })
 end
 
-groupby_queries.test_with_JOIN = function ()
+groupby_queries.test_with_join = function ()
     local api = cluster:server("api-1").net_box
 
     local r, err = api:call("sbroad.execute", { [[
@@ -442,7 +441,7 @@ groupby_queries.test_with_join3 = function ()
 end
 
 
-groupby_queries.test_with_UNION = function ()
+groupby_queries.test_with_union = function ()
     local api = cluster:server("api-1").net_box
     local r, err = api:call("sbroad.execute", {
         [[SELECT "a" FROM "arithmetic_space" GROUP BY "a" UNION ALL SELECT "a" FROM "arithmetic_space2"]], {}
@@ -499,7 +498,7 @@ groupby_queries.test_with_UNION = function ()
     })
 end
 
-groupby_queries.test_with_EXCEPT = function ()
+groupby_queries.test_with_except = function ()
     local api = cluster:server("api-1").net_box
     local r, err = api:call("sbroad.execute", {
         [[
diff --git a/sbroad-cartridge/test_app/test/integration/motion_test.lua b/sbroad-cartridge/test_app/test/integration/motion_test.lua
index 85816ed07aba40ba032fc057e0be4864df977aea..8063e5d3fb939d5273aeb5bb5903eb15385d03ff 100644
--- a/sbroad-cartridge/test_app/test/integration/motion_test.lua
+++ b/sbroad-cartridge/test_app/test/integration/motion_test.lua
@@ -246,14 +246,14 @@ g.test_join_segment_motion = function()
     ]], {} })
 
     t.assert_equals(err, nil)
-    t.assert_equals(r, {
-        metadata = {
+    t.assert_equals(r.metadata, {
             {name = "t1.id", type = "integer"},
-        },
-        rows = {
+        })
+    t.assert_items_equals(r.rows,
+        {
             { 1 },
             { 3 },
             { 2 },
-        },
-    })
+        }
+    )
 end