diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 169aff3f3e997e75a273ad4d1b4025c28d72599e..9c4b1142ecc5c8212e6aad6d168bfa4d043e63f4 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -181,6 +181,7 @@ my $DEFAULT_SUITES= join(',', map { "$_-" } qw(
     percona
     perfschema
     plugins
+    roles
     rpl
     sphinx
     sys_vars
diff --git a/mysql-test/r/acl_roles_admin.result b/mysql-test/suite/roles/admin.result
similarity index 100%
rename from mysql-test/r/acl_roles_admin.result
rename to mysql-test/suite/roles/admin.result
diff --git a/mysql-test/t/acl_roles_admin.test b/mysql-test/suite/roles/admin.test
similarity index 100%
rename from mysql-test/t/acl_roles_admin.test
rename to mysql-test/suite/roles/admin.test
diff --git a/mysql-test/r/acl_roles_create_and_drop_role.result b/mysql-test/suite/roles/create_and_drop_role.result
similarity index 100%
rename from mysql-test/r/acl_roles_create_and_drop_role.result
rename to mysql-test/suite/roles/create_and_drop_role.result
diff --git a/mysql-test/t/acl_roles_create_and_drop_role.test b/mysql-test/suite/roles/create_and_drop_role.test
similarity index 100%
rename from mysql-test/t/acl_roles_create_and_drop_role.test
rename to mysql-test/suite/roles/create_and_drop_role.test
diff --git a/mysql-test/r/acl_roles_create_and_drop_role_invalid_user_table.result b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result
similarity index 100%
rename from mysql-test/r/acl_roles_create_and_drop_role_invalid_user_table.result
rename to mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result
diff --git a/mysql-test/t/acl_roles_create_and_drop_role_invalid_user_table.test b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
similarity index 100%
rename from mysql-test/t/acl_roles_create_and_drop_role_invalid_user_table.test
rename to mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
diff --git a/mysql-test/r/acl_roles_create_and_grant_role.result b/mysql-test/suite/roles/create_and_grant_role.result
similarity index 100%
rename from mysql-test/r/acl_roles_create_and_grant_role.result
rename to mysql-test/suite/roles/create_and_grant_role.result
diff --git a/mysql-test/t/acl_roles_create_and_grant_role.test b/mysql-test/suite/roles/create_and_grant_role.test
similarity index 100%
rename from mysql-test/t/acl_roles_create_and_grant_role.test
rename to mysql-test/suite/roles/create_and_grant_role.test
diff --git a/mysql-test/r/acl_roles_default_create_user_not_role.result b/mysql-test/suite/roles/default_create_user_not_role.result
similarity index 100%
rename from mysql-test/r/acl_roles_default_create_user_not_role.result
rename to mysql-test/suite/roles/default_create_user_not_role.result
diff --git a/mysql-test/t/acl_roles_default_create_user_not_role.test b/mysql-test/suite/roles/default_create_user_not_role.test
similarity index 100%
rename from mysql-test/t/acl_roles_default_create_user_not_role.test
rename to mysql-test/suite/roles/default_create_user_not_role.test
diff --git a/mysql-test/r/acl_roles_definer.result b/mysql-test/suite/roles/definer.result
similarity index 100%
rename from mysql-test/r/acl_roles_definer.result
rename to mysql-test/suite/roles/definer.result
diff --git a/mysql-test/t/acl_roles_definer.test b/mysql-test/suite/roles/definer.test
similarity index 100%
rename from mysql-test/t/acl_roles_definer.test
rename to mysql-test/suite/roles/definer.test
diff --git a/mysql-test/r/acl_roles_none_public.result b/mysql-test/suite/roles/none_public.result
similarity index 100%
rename from mysql-test/r/acl_roles_none_public.result
rename to mysql-test/suite/roles/none_public.result
diff --git a/mysql-test/t/acl_roles_none_public.test b/mysql-test/suite/roles/none_public.test
similarity index 100%
rename from mysql-test/t/acl_roles_none_public.test
rename to mysql-test/suite/roles/none_public.test
diff --git a/mysql-test/r/acl_roles_rebuild_role_grants.result b/mysql-test/suite/roles/rebuild_role_grants.result
similarity index 100%
rename from mysql-test/r/acl_roles_rebuild_role_grants.result
rename to mysql-test/suite/roles/rebuild_role_grants.result
diff --git a/mysql-test/t/acl_roles_rebuild_role_grants.test b/mysql-test/suite/roles/rebuild_role_grants.test
similarity index 100%
rename from mysql-test/t/acl_roles_rebuild_role_grants.test
rename to mysql-test/suite/roles/rebuild_role_grants.test
diff --git a/mysql-test/include/acl_roles_recursive.inc b/mysql-test/suite/roles/recursive.inc
similarity index 100%
rename from mysql-test/include/acl_roles_recursive.inc
rename to mysql-test/suite/roles/recursive.inc
diff --git a/mysql-test/r/acl_roles_recursive.result b/mysql-test/suite/roles/recursive.result
similarity index 100%
rename from mysql-test/r/acl_roles_recursive.result
rename to mysql-test/suite/roles/recursive.result
diff --git a/mysql-test/suite/roles/recursive.test b/mysql-test/suite/roles/recursive.test
new file mode 100644
index 0000000000000000000000000000000000000000..0858f868d424e404e18c8440cd14f445d563c4f2
--- /dev/null
+++ b/mysql-test/suite/roles/recursive.test
@@ -0,0 +1,4 @@
+
+source include/not_debug.inc;
+source recursive.inc;
+
diff --git a/mysql-test/r/acl_roles_recursive_dbug.result b/mysql-test/suite/roles/recursive_dbug.result
similarity index 100%
rename from mysql-test/r/acl_roles_recursive_dbug.result
rename to mysql-test/suite/roles/recursive_dbug.result
diff --git a/mysql-test/t/acl_roles_recursive_dbug.test b/mysql-test/suite/roles/recursive_dbug.test
similarity index 85%
rename from mysql-test/t/acl_roles_recursive_dbug.test
rename to mysql-test/suite/roles/recursive_dbug.test
index 852eafa00358d9f95cc381eea8b2aba278b1200f..811695994e05f21e43eddfdeef7752f877d0f640 100644
--- a/mysql-test/t/acl_roles_recursive_dbug.test
+++ b/mysql-test/suite/roles/recursive_dbug.test
@@ -8,7 +8,7 @@ show status like 'debug%';
 set @old_dbug=@@global.debug_dbug;
 set global debug_dbug="+d,role_merge_stats";
 
-source include/acl_roles_recursive.inc; 
+source recursive.inc; 
 
 set global debug_dbug=@old_dbug;
 
diff --git a/mysql-test/r/acl_roles_rename_user.result b/mysql-test/suite/roles/rename_user.result
similarity index 100%
rename from mysql-test/r/acl_roles_rename_user.result
rename to mysql-test/suite/roles/rename_user.result
diff --git a/mysql-test/t/acl_roles_rename_user.test b/mysql-test/suite/roles/rename_user.test
similarity index 100%
rename from mysql-test/t/acl_roles_rename_user.test
rename to mysql-test/suite/roles/rename_user.test
diff --git a/mysql-test/r/acl_roles_rpl_definer.result b/mysql-test/suite/roles/rpl_definer.result
similarity index 100%
rename from mysql-test/r/acl_roles_rpl_definer.result
rename to mysql-test/suite/roles/rpl_definer.result
diff --git a/mysql-test/t/acl_roles_rpl_definer.test b/mysql-test/suite/roles/rpl_definer.test
similarity index 100%
rename from mysql-test/t/acl_roles_rpl_definer.test
rename to mysql-test/suite/roles/rpl_definer.test
diff --git a/mysql-test/r/acl_roles_set_role-database-recursive.result b/mysql-test/suite/roles/set_role-database-recursive.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-database-recursive.result
rename to mysql-test/suite/roles/set_role-database-recursive.result
diff --git a/mysql-test/t/acl_roles_set_role-database-recursive.test b/mysql-test/suite/roles/set_role-database-recursive.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-database-recursive.test
rename to mysql-test/suite/roles/set_role-database-recursive.test
diff --git a/mysql-test/r/acl_roles_set_role-database-simple.result b/mysql-test/suite/roles/set_role-database-simple.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-database-simple.result
rename to mysql-test/suite/roles/set_role-database-simple.result
diff --git a/mysql-test/t/acl_roles_set_role-database-simple.test b/mysql-test/suite/roles/set_role-database-simple.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-database-simple.test
rename to mysql-test/suite/roles/set_role-database-simple.test
diff --git a/mysql-test/r/acl_roles_set_role-multiple-role.result b/mysql-test/suite/roles/set_role-multiple-role.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-multiple-role.result
rename to mysql-test/suite/roles/set_role-multiple-role.result
diff --git a/mysql-test/t/acl_roles_set_role-multiple-role.test b/mysql-test/suite/roles/set_role-multiple-role.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-multiple-role.test
rename to mysql-test/suite/roles/set_role-multiple-role.test
diff --git a/mysql-test/r/acl_roles_set_role-recursive.result b/mysql-test/suite/roles/set_role-recursive.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-recursive.result
rename to mysql-test/suite/roles/set_role-recursive.result
diff --git a/mysql-test/t/acl_roles_set_role-recursive.test b/mysql-test/suite/roles/set_role-recursive.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-recursive.test
rename to mysql-test/suite/roles/set_role-recursive.test
diff --git a/mysql-test/r/acl_roles_set_role-routine-simple.result b/mysql-test/suite/roles/set_role-routine-simple.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-routine-simple.result
rename to mysql-test/suite/roles/set_role-routine-simple.result
diff --git a/mysql-test/t/acl_roles_set_role-routine-simple.test b/mysql-test/suite/roles/set_role-routine-simple.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-routine-simple.test
rename to mysql-test/suite/roles/set_role-routine-simple.test
diff --git a/mysql-test/r/acl_roles_set_role-simple.result b/mysql-test/suite/roles/set_role-simple.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-simple.result
rename to mysql-test/suite/roles/set_role-simple.result
diff --git a/mysql-test/t/acl_roles_set_role-simple.test b/mysql-test/suite/roles/set_role-simple.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-simple.test
rename to mysql-test/suite/roles/set_role-simple.test
diff --git a/mysql-test/r/acl_roles_set_role-table-column-priv.result b/mysql-test/suite/roles/set_role-table-column-priv.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-table-column-priv.result
rename to mysql-test/suite/roles/set_role-table-column-priv.result
diff --git a/mysql-test/t/acl_roles_set_role-table-column-priv.test b/mysql-test/suite/roles/set_role-table-column-priv.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-table-column-priv.test
rename to mysql-test/suite/roles/set_role-table-column-priv.test
diff --git a/mysql-test/r/acl_roles_set_role-table-simple.result b/mysql-test/suite/roles/set_role-table-simple.result
similarity index 100%
rename from mysql-test/r/acl_roles_set_role-table-simple.result
rename to mysql-test/suite/roles/set_role-table-simple.result
diff --git a/mysql-test/t/acl_roles_set_role-table-simple.test b/mysql-test/suite/roles/set_role-table-simple.test
similarity index 100%
rename from mysql-test/t/acl_roles_set_role-table-simple.test
rename to mysql-test/suite/roles/set_role-table-simple.test
diff --git a/mysql-test/r/acl_roles_show_grants.result b/mysql-test/suite/roles/show_grants.result
similarity index 100%
rename from mysql-test/r/acl_roles_show_grants.result
rename to mysql-test/suite/roles/show_grants.result
diff --git a/mysql-test/t/acl_roles_show_grants.test b/mysql-test/suite/roles/show_grants.test
similarity index 100%
rename from mysql-test/t/acl_roles_show_grants.test
rename to mysql-test/suite/roles/show_grants.test
diff --git a/mysql-test/t/acl_roles_recursive.test b/mysql-test/t/acl_roles_recursive.test
deleted file mode 100644
index 8d7077772eb5a3b05c0bf4f5ab444dab29ac9995..0000000000000000000000000000000000000000
--- a/mysql-test/t/acl_roles_recursive.test
+++ /dev/null
@@ -1,4 +0,0 @@
-
-source include/not_debug.inc;
-source include/acl_roles_recursive.inc;
-