1 files changed, 24 insertions, 13 deletions
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 810689b4a3..d4912680ec 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -18,9 +18,9 @@
 %%
 -module(application_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1, failover/1, failover_comp/1, permissions/1, load/1, reported_bugs/1,
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, failover/1, failover_comp/1, permissions/1, load/1,
 	 load_use_cache/1,
 	 otp_1586/1, otp_2078/1, otp_2012/1, otp_2718/1, otp_2973/1,
 	 otp_3002/1, otp_3184/1, otp_4066/1, otp_4227/1, otp_5363/1,
@@ -30,7 +30,7 @@
 	 nodedown_start/1, init2973/0, loop2973/0, loop5606/1]).
 
 -export([config_change/1,
-	 distr_changed/1, distr_changed_tc1/1, distr_changed_tc2/1,
+	 distr_changed_tc1/1, distr_changed_tc2/1,
 	 shutdown_func/1, do_shutdown/1]).
 
 -define(TESTCASE, testcase_name).
@@ -41,12 +41,27 @@
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(2)).
 
-all(suite) ->
-    [failover, failover_comp, permissions, load,
-     load_use_cache, reported_bugs, 
-     start_phases, script_start, nodedown_start, 
-     permit_false_start_local, permit_false_start_dist,
-     get_key, distr_changed, config_change, shutdown_func].
+all() -> 
+[failover, failover_comp, permissions, load,
+ load_use_cache, {group, reported_bugs}, start_phases,
+ script_start, nodedown_start, permit_false_start_local,
+ permit_false_start_dist, get_key,
+ {group, distr_changed}, config_change, shutdown_func].
+
+groups() -> 
+    [{reported_bugs, [],
+  [otp_1586, otp_2078, otp_2012, otp_2718, otp_2973,
+   otp_3002, otp_3184, otp_4066, otp_4227, otp_5363,
+   otp_5606]},
+ {distr_changed, [],
+  [distr_changed_tc1, distr_changed_tc2]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 
 init_per_testcase(otp_2973=Case, Config) ->
@@ -932,9 +947,6 @@ nodedown_start(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
-reported_bugs(suite) -> [otp_1586, otp_2078, otp_2012, otp_2718,
-			 otp_2973, otp_3002, otp_3184, otp_4066,
-			 otp_4227, otp_5363, otp_5606].
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1586
@@ -1589,7 +1601,6 @@ get_key(Conf) when is_list(Conf) ->
 %%%-----------------------------------------------------------------
 %%% Testing of change of distributed parameter.
 %%%-----------------------------------------------------------------
-distr_changed(suite) -> [distr_changed_tc1, distr_changed_tc2].
 
 distr_changed_tc1(suite) -> [];
 distr_changed_tc1(doc) -> ["Test change of distributed parameter."];