diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl
index c99ef80bc..f40c08f66 100644
--- a/test/ejabberd_SUITE.erl
+++ b/test/ejabberd_SUITE.erl
@@ -71,7 +71,13 @@ end_per_suite(_Config) ->
     application:stop(ejabberd).
 
 init_per_group(Group, Config) ->
-    case lists:member(Group, ?BACKENDS) of
+    BackendOfGroup = case Group of
+                         component -> agnostic;
+                         no_db -> agnostic;
+                         s2s -> agnostic;
+                         _ -> Group
+                     end,
+    case lists:member(BackendOfGroup, ?BACKENDS) of
         false ->
             %% Not a backend related group, do default init:
             do_init_per_group(Group, Config);
@@ -82,7 +88,7 @@ init_per_group(Group, Config) ->
                     do_init_per_group(Group, Config);
                 Backends ->
                     %% Skipped backends that were not explicitly enabled
-		    case lists:member(Group, Backends) of
+		    case lists:member(BackendOfGroup, Backends) of
 			true ->
 			    do_init_per_group(Group, Config);
 			false ->
diff --git a/test/suite.erl b/test/suite.erl
index c95d10032..6b6129662 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -229,7 +229,7 @@ get_config_backends() ->
 		  end,
     application:load(ejabberd),
     EnabledBackends = application:get_env(ejabberd, enabled_backends, EnvBackends),
-    misc:intersection(EnvBackends, [mnesia, ldap, extauth|EnabledBackends]).
+    misc:intersection(EnvBackends, [agnostic, mnesia, ldap, extauth|EnabledBackends]).
 
 process_config_tpl(Content, []) ->
     Content;
diff --git a/test/suite.hrl b/test/suite.hrl
index 7d7d24ba9..1869369e0 100644
--- a/test/suite.hrl
+++ b/test/suite.hrl
@@ -103,7 +103,7 @@
 -define(S2S_VHOST, <<"s2s.localhost">>).
 -define(UPLOAD_VHOST, <<"upload.localhost">>).
 
--define(BACKENDS, [mnesia, redis, mysql, mssql, pgsql, sqlite, ldap, extauth]).
+-define(BACKENDS, [agnostic, mnesia, redis, mysql, mssql, pgsql, sqlite, ldap, extauth]).
 
 insert(Val, N, Tuple) ->
     L = tuple_to_list(Tuple),