Merge branch 'peppe/common_test/group_events'

* peppe/common_test/group_events:
  Update test suites and fix various remaining problems
  Update event protocol and CT Hooks API
  Introduce group name for skipped cases in events, hooks and overview log

OTP-11732

15 files changed, 271 insertions, 236 deletions

diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 580588fbd2..63bfea68c4 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -1277,28 +1277,35 @@ report(What,Data) ->
 	    ct_util:set_testdata({What,Data}),
 	    ok;
 	tc_start ->
-	    %% Data = {{Suite,Func},LogFileName}
+	    %% Data = {Suite,{Func,GroupName}},LogFileName}
+	    Data1 = case Data of
+			{{Suite,{Func,undefined}},LFN} -> {{Suite,Func},LFN};
+			_ -> Data
+		    end,
 	    ct_event:sync_notify(#event{name=tc_logfile,
 					node=node(),
-					data=Data}),
+					data=Data1}),
 	    ok;
 	tc_done ->
-	    {_Suite,Case,Result} = Data,
+	    {Suite,{Func,GrName},Result} = Data,
+	    Data1 = if GrName == undefined -> {Suite,Func,Result};
+		       true                -> Data
+	    end,
 	    case Result of
 		{failed, _} ->
-		    ct_hooks:on_tc_fail(What, Data);
+		    ct_hooks:on_tc_fail(What, Data1);
 		{skipped,{failed,{_,init_per_testcase,_}}} ->
-		    ct_hooks:on_tc_skip(tc_auto_skip, Data);
+		    ct_hooks:on_tc_skip(tc_auto_skip, Data1);
 		{skipped,{require_failed,_}} ->
-		    ct_hooks:on_tc_skip(tc_auto_skip, Data);
+		    ct_hooks:on_tc_skip(tc_auto_skip, Data1);
 		{skipped,_} ->
-		    ct_hooks:on_tc_skip(tc_user_skip, Data);
+		    ct_hooks:on_tc_skip(tc_user_skip, Data1);
 		{auto_skipped,_} ->
-		    ct_hooks:on_tc_skip(tc_auto_skip, Data);
+		    ct_hooks:on_tc_skip(tc_auto_skip, Data1);
 		_Else ->
 		    ok
 	    end,
-	    case {Case,Result} of
+	    case {Func,Result} of
 		{init_per_suite,_} ->
 		    ok;
 		{end_per_suite,_} ->
@@ -1327,20 +1334,17 @@ report(What,Data) ->
 	tc_user_skip ->
 	    %% test case or config function specified as skipped in testspec,
 	    %% or init config func for suite/group has returned {skip,Reason}
-	    %% Data = {Suite,Case,Comment} | 
-	    %%        {Suite,{GroupConfigFunc,GroupName},Comment} 
+	    %% Data = {Suite,{Func,GroupName},Comment}
 	    {Func,Data1} = case Data of
-			       {Suite,{ConfigFunc,undefined},Cmt} ->
-				   {ConfigFunc,{Suite,ConfigFunc,Cmt}};
-			       {_,{ConfigFunc,_},_} -> {ConfigFunc,Data};
-			       {_,Case,_} -> {Case,Data}
+			       {Suite,{F,undefined},Comment} ->
+				   {F,{Suite,F,Comment}};
+			       D = {_,{F,_},_} ->
+				   {F,D}
 			   end,
-
 	    ct_event:sync_notify(#event{name=tc_user_skip,
 					node=node(),
 					data=Data1}),
 	    ct_hooks:on_tc_skip(What, Data1),
-
 	    if Func /= init_per_suite, Func /= init_per_group,
 	       Func /= end_per_suite, Func /= end_per_group ->
 		    add_to_stats(user_skipped);
@@ -1350,13 +1354,12 @@ report(What,Data) ->
 	tc_auto_skip ->
 	    %% test case skipped because of error in config function, or
 	    %% config function skipped because of error in info function
-	    %% Data = {Suite,Case,Comment} |
-	    %%        {Suite,{GroupConfigFunc,GroupName},Comment} 
+	    %% Data = {Suite,{Func,GroupName},Comment}
 	    {Func,Data1} = case Data of
-			       {Suite,{ConfigFunc,undefined},Cmt} ->
-				   {ConfigFunc,{Suite,ConfigFunc,Cmt}};
-			       {_,{ConfigFunc,_},_} -> {ConfigFunc,Data};
-			       {_,Case,_} -> {Case,Data}
+			       {Suite,{F,undefined},Comment} ->
+				   {F,{Suite,F,Comment}};
+			       D = {_,{F,_},_} ->
+				   {F,D}
 			   end,
 	    %% this test case does not have a log, so printouts
 	    %% from event handlers should end up in the main log
@@ -1364,7 +1367,6 @@ report(What,Data) ->
 					node=node(),
 					data=Data1}),
 	    ct_hooks:on_tc_skip(What, Data1),
-
 	    if Func /= end_per_suite, 
 	       Func /= end_per_group ->
 		    add_to_stats(auto_skipped);
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index e845e9e908..2e667030a9 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -121,9 +121,11 @@ end_tc(_Mod, TC, Config, Result, _Return) ->
     call(fun call_generic/3, Result, [post_end_per_testcase, TC, Config],
 	'$ct_no_change').
 
+%% Case = TestCase | {TestCase,GroupName}
 on_tc_skip(How, {Suite, Case, Reason}) ->
     call(fun call_cleanup/3, {How, Reason}, [on_tc_skip, Suite, Case]).
 
+%% Case = TestCase | {TestCase,GroupName}
 on_tc_fail(_How, {Suite, Case, Reason}) ->
     call(fun call_cleanup/3, Reason, [on_tc_fail, Suite, Case]).
 
diff --git a/lib/common_test/test/ct_config_info_SUITE.erl b/lib/common_test/test/ct_config_info_SUITE.erl
index 8f2f0eb75f..9c242a41df 100644
--- a/lib/common_test/test/ct_config_info_SUITE.erl
+++ b/lib/common_test/test/ct_config_info_SUITE.erl
@@ -125,7 +125,7 @@ test_events(config_info) ->
      [{?eh,tc_start,{config_info_1_SUITE,{init_per_group,g1,[]}}},
       {?eh,tc_done,{config_info_1_SUITE,{init_per_group,g1,[]},
 		    {failed,{timetrap_timeout,350}}}},
-      {?eh,tc_auto_skip,{config_info_1_SUITE,t11,
+      {?eh,tc_auto_skip,{config_info_1_SUITE,{t11,g1},
 	{failed,{config_info_1_SUITE,init_per_group,{timetrap_timeout,350}}}}},
       {?eh,tc_auto_skip,{config_info_1_SUITE,{end_per_group,g1},
 			 {failed,{config_info_1_SUITE,init_per_group,
@@ -142,7 +142,7 @@ test_events(config_info) ->
       [{?eh,tc_start,{config_info_1_SUITE,{init_per_group,g4,[]}}},
        {?eh,tc_done,{config_info_1_SUITE,{init_per_group,g4,[]},
 		     {failed,{timetrap_timeout,400}}}},
-       {?eh,tc_auto_skip,{config_info_1_SUITE,t41,
+       {?eh,tc_auto_skip,{config_info_1_SUITE,{t41,g4},
 	 {failed,{config_info_1_SUITE,init_per_group,
 		  {timetrap_timeout,400}}}}},
        {?eh,tc_auto_skip,{config_info_1_SUITE,{end_per_group,g4},
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 194e7d42ae..ecf231529a 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -369,8 +369,8 @@ test_events(cfg_error) ->
 				      {'EXIT',init_per_suite_fails}}}}},
      {?eh,test_stats,{0,0,{0,1}}},
      {?eh,tc_auto_skip,
-      {cfg_error_1_SUITE,tc2,{failed,{cfg_error_1_SUITE,init_per_suite,
-				      {'EXIT',init_per_suite_fails}}}}},
+      {cfg_error_1_SUITE,{tc2,g1},{failed,{cfg_error_1_SUITE,init_per_suite,
+					   {'EXIT',init_per_suite_fails}}}}},
      {?eh,test_stats,{0,0,{0,2}}},
      {?eh,tc_auto_skip,
       {cfg_error_1_SUITE,end_per_suite,{failed,{cfg_error_1_SUITE,init_per_suite,
@@ -386,7 +386,7 @@ test_events(cfg_error) ->
 		{'EXIT',{{badmatch,[1,2]},'_'}}}}}},
      {?eh,test_stats,{0,0,{0,3}}},
      {?eh,tc_auto_skip,
-      {cfg_error_2_SUITE,tc2,
+      {cfg_error_2_SUITE,{tc2,g1},
        {failed,{cfg_error_2_SUITE,init_per_suite,      
 		{'EXIT',{{badmatch,[1,2]},'_'}}}}}},
      {?eh,test_stats,{0,0,{0,4}}},
@@ -403,7 +403,7 @@ test_events(cfg_error) ->
        {failed,{cfg_error_3_SUITE,init_per_suite,{timetrap_timeout,2000}}}}},
      {?eh,test_stats,{0,0,{0,5}}},
      {?eh,tc_auto_skip,
-      {cfg_error_3_SUITE,tc2,
+      {cfg_error_3_SUITE,{tc2,g1},
        {failed,{cfg_error_3_SUITE,init_per_suite,{timetrap_timeout,2000}}}}},
      {?eh,test_stats,{0,0,{0,6}}},
      {?eh,tc_auto_skip,
@@ -417,7 +417,7 @@ test_events(cfg_error) ->
        {failed,{cfg_error_4_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,7}}},
      {?eh,tc_auto_skip,
-      {cfg_error_4_SUITE,tc2,
+      {cfg_error_4_SUITE,{tc2,g1},
        {failed,{cfg_error_4_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,8}}},
      {?eh,tc_auto_skip,
@@ -431,7 +431,7 @@ test_events(cfg_error) ->
        {failed,{cfg_error_5_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,9}}},
      {?eh,tc_auto_skip,
-      {cfg_error_5_SUITE,tc2,
+      {cfg_error_5_SUITE,{tc2,g1},
        {failed,{cfg_error_5_SUITE,init_per_suite,bad_return}}}},
      {?eh,test_stats,{0,0,{0,10}}},
      {?eh,tc_auto_skip,
@@ -477,7 +477,7 @@ test_events(cfg_error) ->
        {cfg_error_8_SUITE,{init_per_group,g1,[]},
 	{failed,{error,{init_per_group_fails,g1}}}}},
       {?eh,tc_auto_skip,
-       {cfg_error_8_SUITE,tc1,
+       {cfg_error_8_SUITE,{tc1,g1},
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{init_per_group_fails,g1}}}}}},
       {?eh,test_stats,{4,0,{0,11}}},
@@ -489,7 +489,7 @@ test_events(cfg_error) ->
      [{?eh,tc_start,{cfg_error_8_SUITE,{init_per_group,g2,[]}}},
       {?eh,tc_done,{cfg_error_8_SUITE,{init_per_group,g2,[]},
 		    {failed,{timetrap_timeout,2000}}}},
-      {?eh,tc_auto_skip,{cfg_error_8_SUITE,tc1,
+      {?eh,tc_auto_skip,{cfg_error_8_SUITE,{tc1,g2},
 			 {failed,{cfg_error_8_SUITE,init_per_group,
 				  {timetrap_timeout,2000}}}}},
       {?eh,test_stats,{4,0,{0,12}}},
@@ -502,7 +502,7 @@ test_events(cfg_error) ->
        {cfg_error_8_SUITE,{init_per_group,g3,[]},
 	{failed,{error,{{badmatch,42},'_'}}}}},
       {?eh,tc_auto_skip,
-       {cfg_error_8_SUITE,tc1,
+       {cfg_error_8_SUITE,{tc1,g3},
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{{badmatch,42},'_'}}}}}},
       {?eh,test_stats,{4,0,{0,13}}},
@@ -528,7 +528,7 @@ test_events(cfg_error) ->
        {?eh,tc_done,{cfg_error_8_SUITE,{init_per_group,g6,[]},
 		     {failed,{error,{sub_group_failed,g6}}}}},
        {?eh,tc_auto_skip,
-	{cfg_error_8_SUITE,tc2,
+	{cfg_error_8_SUITE,{tc2,g6},
 	 {failed,{cfg_error_8_SUITE,init_per_group,
 		  {'EXIT',{sub_group_failed,g6}}}}}},
        {?eh,test_stats,{6,0,{0,14}}},
@@ -1111,11 +1111,11 @@ test_events(timetrap_fun_group) ->
      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g4,[]}}},
       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g4,[]},
 		    {user_timetrap_error,{kaboom,'_'}}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,g4},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,1}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,g4},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,2}}},
@@ -1126,11 +1126,11 @@ test_events(timetrap_fun_group) ->
      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g5,[]}}},
       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g5,[]},
 		    {user_timetrap_error,{kaboom,'_'}}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,g5},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,3}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,g5},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}},
       {?eh,test_stats,{0,11,{0,4}}},
@@ -1141,11 +1141,11 @@ test_events(timetrap_fun_group) ->
      [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,g6,[]}}},
       {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,g6,[]},
 		    {failed,{timetrap_timeout,{'$approx',500}}}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,g6},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {timetrap_timeout,'_'}}}}},
       {?eh,test_stats,{0,11,{0,5}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,g6},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {timetrap_timeout,'_'}}}}},
       {?eh,test_stats,{0,11,{0,6}}},
@@ -1294,11 +1294,11 @@ test_events(timetrap_fun_group) ->
       [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg4,[parallel]}}},
        {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg4,[parallel]},
 		     {user_timetrap_error,{kaboom,'_'}}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,pg4},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,7}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,pg4},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,8}}},
@@ -1310,11 +1310,11 @@ test_events(timetrap_fun_group) ->
       [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg5,[parallel]}}},
        {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg5,[parallel]},
 		     {user_timetrap_error,{kaboom,'_'}}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,pg5},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,9}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,pg5},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}},
        {?eh,test_stats,{4,26,{0,10}}},
@@ -1326,11 +1326,11 @@ test_events(timetrap_fun_group) ->
       [{?eh,tc_start,{timetrap_8_SUITE,{init_per_group,pg6,[parallel]}}},
        {?eh,tc_done,{timetrap_8_SUITE,{init_per_group,pg6,[parallel]},
 		     {failed,{timetrap_timeout,{'$approx',500}}}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc0,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc0,pg6},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {timetrap_timeout,'_'}}}}},
        {?eh,test_stats,{4,26,{0,11}}},
-       {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,pg6},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {timetrap_timeout,'_'}}}}},
        {?eh,test_stats,{4,26,{0,12}}},
@@ -1407,10 +1407,10 @@ test_events(timetrap_fun_group) ->
       {?eh,tc_done,{timetrap_8_SUITE,tc0,
 		    {user_timetrap_error,{kaboom,'_'}}}},
       {?eh,test_stats,{9,31,{0,12}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc1,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc1,sg1},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{9,31,{0,13}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,sg1},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{9,31,{0,14}}},
        {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,sg1,[sequence]}}},
@@ -1425,10 +1425,10 @@ test_events(timetrap_fun_group) ->
       {?eh,tc_done,{timetrap_8_SUITE,tc0,
 		    {failed,{timetrap_timeout,{'$approx',1000}}}}},
       {?eh,test_stats,{10,32,{0,14}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc1,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc1,sg2},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{10,32,{0,15}}},
-      {?eh,tc_auto_skip,{timetrap_8_SUITE,tc2,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{tc2,sg2},
 			 {failed,{timetrap_8_SUITE,tc0}}}},
       {?eh,test_stats,{10,32,{0,16}}},
       {?eh,tc_start,{timetrap_8_SUITE,{end_per_group,sg2,[sequence]}}},
diff --git a/lib/common_test/test/ct_group_info_SUITE.erl b/lib/common_test/test/ct_group_info_SUITE.erl
index e7bc5baaa1..83ac7dbbcf 100644
--- a/lib/common_test/test/ct_group_info_SUITE.erl
+++ b/lib/common_test/test/ct_group_info_SUITE.erl
@@ -273,7 +273,7 @@ test_events(timetrap_all) ->
 		    {init_per_group,g11,[]},
 		    {auto_skipped,{group0_failed,bad_return_value}}}},
       {?eh,tc_auto_skip,
-       {group_timetrap_1_SUITE,t111,{group0_failed,bad_return_value}}},
+       {group_timetrap_1_SUITE,{t111,g11},{group0_failed,bad_return_value}}},
       {?eh,test_stats,{0,13,{0,1}}},
       {?eh,tc_auto_skip,{group_timetrap_1_SUITE,
 			 {end_per_group,g11},
@@ -431,7 +431,7 @@ test_events(timetrap_all_no_ips) ->
       {?eh,tc_done,{group_timetrap_2_SUITE,
 		    {init_per_group,g11,[]},
 		    {auto_skipped,{group0_failed,bad_return_value}}}},
-      {?eh,tc_auto_skip,{group_timetrap_2_SUITE,t111,
+      {?eh,tc_auto_skip,{group_timetrap_2_SUITE,{t111,g11},
 			 {group0_failed,bad_return_value}}},
       {?eh,test_stats,{0,13,{0,1}}},
       {?eh,tc_auto_skip,{group_timetrap_2_SUITE,
@@ -512,7 +512,7 @@ test_events(timetrap_all_no_ipg) ->
       {?eh,tc_done,{ct_framework,
 		    {init_per_group,g11,[{suite,group_timetrap_3_SUITE}]},
 		    {auto_skipped,{group0_failed,bad_return_value}}}},
-      {?eh,tc_auto_skip,{group_timetrap_3_SUITE,t111,{group0_failed,bad_return_value}}},
+      {?eh,tc_auto_skip,{group_timetrap_3_SUITE,{t111,g11},{group0_failed,bad_return_value}}},
       {?eh,test_stats,{0,13,{0,1}}},
       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g11},
 			 {group0_failed,bad_return_value}}}],
@@ -551,7 +551,7 @@ test_events(require) ->
       {?eh,tc_done,{group_require_1_SUITE,{init_per_group,g4,[]},
 		    {auto_skipped,{require_failed,
 				   {name_in_use,common2_alias,common2}}}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,t41,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{t41,g4},
 			  {require_failed,
 			   {name_in_use,common2_alias,common2}}}},
       {?eh,test_stats,{4,0,{0,1}}},
@@ -580,7 +580,7 @@ test_events(require) ->
 		    {init_per_group,g8,[]},
 		    {auto_skipped,{require_failed,
 				   {not_available,non_existing}}}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,t81,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{t81,g8},
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,{end_per_group,g8},
@@ -604,7 +604,7 @@ test_events(require) ->
       {?eh,tc_done,{group_require_1_SUITE,
 		    {init_per_group,g11,[]},
 		    {auto_skipped,{group0_failed,bad_return_value}}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,t111,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{t111,g11},
 			 {group0_failed,bad_return_value}}},
       {?eh,test_stats,{9,0,{0,4}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,
@@ -646,7 +646,7 @@ test_events(require_default) ->
       {?eh,tc_done,{group_require_1_SUITE,
 		    {init_per_group,g4,[]},
 		    {auto_skipped,{require_failed,{not_available,common3}}}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,t41,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{t41,g4},
 			 {require_failed,{not_available,common3}}}},
       {?eh,test_stats,{4,0,{0,1}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,{end_per_group,g4},
@@ -674,7 +674,7 @@ test_events(require_default) ->
 		    {init_per_group,g8,[]},
 		    {auto_skipped,{require_failed,
 				   {not_available,non_existing}}}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,t81,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{t81,g8},
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,{end_per_group,g8},
@@ -699,7 +699,7 @@ test_events(require_default) ->
       {?eh,tc_done,{group_require_1_SUITE,
 		    {init_per_group,g11,[]},
 		    {auto_skipped,{group0_failed,bad_return_value}}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,t111,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{t111,g11},
 			 {group0_failed,bad_return_value}}},
       {?eh,test_stats,{9,0,{0,4}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,
@@ -740,7 +740,7 @@ test_events(require_no_ips) ->
       {?eh,tc_done,{group_require_2_SUITE,{init_per_group,g4,[]},
 		    {auto_skipped,{require_failed,
 				   {name_in_use,common2_alias,common2}}}}},
-      {?eh,tc_auto_skip,{group_require_2_SUITE,t41,
+      {?eh,tc_auto_skip,{group_require_2_SUITE,{t41,g4},
 			  {require_failed,{name_in_use,common2_alias,common2}}}},
       {?eh,test_stats,{4,0,{0,1}}},
       {?eh,tc_auto_skip,{group_require_2_SUITE,{end_per_group,g4},
@@ -768,7 +768,7 @@ test_events(require_no_ips) ->
 		    {init_per_group,g8,[]},
 		    {auto_skipped,{require_failed,
 				   {not_available,non_existing}}}}},
-      {?eh,tc_auto_skip,{group_require_2_SUITE,t81,
+      {?eh,tc_auto_skip,{group_require_2_SUITE,{t81,g8},
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
       {?eh,tc_auto_skip,{group_require_2_SUITE,{end_per_group,g8},
@@ -792,7 +792,7 @@ test_events(require_no_ips) ->
       {?eh,tc_done,{group_require_2_SUITE,
 		    {init_per_group,g11,[]},
 		    {auto_skipped,{group0_failed,bad_return_value}}}},
-      {?eh,tc_auto_skip,{group_require_2_SUITE,t111,
+      {?eh,tc_auto_skip,{group_require_2_SUITE,{t111,g11},
 			 {group0_failed,bad_return_value}}},
       {?eh,test_stats,{9,0,{0,4}}},
       {?eh,tc_auto_skip,{group_require_2_SUITE,
@@ -831,7 +831,7 @@ test_events(require_no_ipg) ->
      [{?eh,tc_start,{ct_framework,{init_per_group,g4,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{init_per_group,g4,[{suite,group_require_3_SUITE}]},
 		    {auto_skipped,{require_failed,{name_in_use,common2_alias,common2}}}}},
-      {?eh,tc_auto_skip,{group_require_3_SUITE,t41,
+      {?eh,tc_auto_skip,{group_require_3_SUITE,{t41,g4},
 			 {require_failed,{name_in_use,common2_alias,common2}}}},
       {?eh,test_stats,{4,0,{0,1}}},
       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g4},
@@ -857,7 +857,7 @@ test_events(require_no_ipg) ->
      [{?eh,tc_start,{ct_framework,{init_per_group,g8,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{init_per_group,g8,[{suite,group_require_3_SUITE}]},
 		    {auto_skipped,{require_failed,{not_available,non_existing}}}}},
-      {?eh,tc_auto_skip,{group_require_3_SUITE,t81,
+      {?eh,tc_auto_skip,{group_require_3_SUITE,{t81,g8},
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g8},
@@ -879,7 +879,7 @@ test_events(require_no_ipg) ->
      [{?eh,tc_start,{ct_framework,{init_per_group,g11,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{init_per_group,g11,[{suite,group_require_3_SUITE}]},
 		    {auto_skipped,{group0_failed,bad_return_value}}}},
-      {?eh,tc_auto_skip,{group_require_3_SUITE,t111,{group0_failed,bad_return_value}}},
+      {?eh,tc_auto_skip,{group_require_3_SUITE,{t111,g11},{group0_failed,bad_return_value}}},
       {?eh,test_stats,{9,0,{0,4}}},
       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g11},
 			 {group0_failed,bad_return_value}}}],
diff --git a/lib/common_test/test/ct_groups_spec_SUITE.erl b/lib/common_test/test/ct_groups_spec_SUITE.erl
index 5a6d5ac0ac..de4ab77229 100644
--- a/lib/common_test/test/ct_groups_spec_SUITE.erl
+++ b/lib/common_test/test/ct_groups_spec_SUITE.erl
@@ -246,7 +246,8 @@ test_events(override_with_all) ->
       {?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g1,[sequence]},ok}},
       {?eh,tc_done,{groups_spec_1_SUITE,t11,ok}},
       {?eh,tc_done,{groups_spec_1_SUITE,t12,{failed,{error,crashes}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t13,{failed,{groups_spec_1_SUITE,t12}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t13,g1},
+			 {failed,{groups_spec_1_SUITE,t12}}}},
       {?eh,test_stats,{3,2,{0,1}}},
       {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g1,[sequence]}}},
       {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g1,[sequence]},ok}}],
@@ -327,19 +328,27 @@ test_events(override_with_all) ->
        {?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g3,[sequence]},ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t31,ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t32,{failed,{error,crashes}}}},
-       {?eh,tc_auto_skip,{groups_spec_1_SUITE,t33,{failed,{groups_spec_1_SUITE,t32}}}},
+       {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t33,g3},
+			  {failed,{groups_spec_1_SUITE,t32}}}},
        {?eh,test_stats,{14,9,{0,2}}},
        {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]}}},
        {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]},ok}}],
 
       {?eh,tc_done,{groups_spec_1_SUITE,t22,{failed,{error,crashes}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t41,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t51,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t52,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t53,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t54,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t42,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t23,{failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t41,g4},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t51,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t52,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t53,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t54,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t42,g4},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t23,g2},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
       {?eh,test_stats,{14,10,{0,9}}},
 
       {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g2,[sequence]}}},
@@ -355,7 +364,8 @@ test_events(override_with_all) ->
        {?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g3,[sequence]},ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t31,ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t32,{failed,{error,crashes}}}},
-       {?eh,tc_auto_skip,{groups_spec_1_SUITE,t33,{failed,{groups_spec_1_SUITE,t32}}}},
+       {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t33,g3},
+			  {failed,{groups_spec_1_SUITE,t32}}}},
        {?eh,test_stats,{16,11,{0,10}}},
        {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]}}},
        {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]},ok}}],
@@ -372,8 +382,10 @@ test_events(override_with_all) ->
 	{?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g5,[sequence]},ok}},
 	{?eh,tc_done,{groups_spec_1_SUITE,t51,ok}},
 	{?eh,tc_done,{groups_spec_1_SUITE,t52,{failed,{timetrap_timeout,2000}}}},
-	{?eh,tc_auto_skip,{groups_spec_1_SUITE,t53,{failed,{groups_spec_1_SUITE,t52}}}},
-	{?eh,tc_auto_skip,{groups_spec_1_SUITE,t54,{failed,{groups_spec_1_SUITE,t52}}}},
+	{?eh,tc_auto_skip,{groups_spec_1_SUITE,{t53,g5},
+			   {failed,{groups_spec_1_SUITE,t52}}}},
+	{?eh,tc_auto_skip,{groups_spec_1_SUITE,{t54,g5},
+			   {failed,{groups_spec_1_SUITE,t52}}}},
 	{?eh,test_stats,{18,13,{0,12}}},
 	{?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g5,[sequence]}}},
 	{?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g5,[sequence]},ok}}],
@@ -417,7 +429,8 @@ test_events(override_with_spec) ->
       {?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g1,[sequence]},ok}},
       {?eh,tc_done,{groups_spec_1_SUITE,t11,ok}},
       {?eh,tc_done,{groups_spec_1_SUITE,t12,{failed,{error,crashes}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t13,{failed,{groups_spec_1_SUITE,t12}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t13,g1},
+			 {failed,{groups_spec_1_SUITE,t12}}}},
       {?eh,test_stats,{3,2,{0,1}}},
       {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g1,[sequence]}}},
       {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g1,[sequence]},ok}}],
@@ -493,18 +506,26 @@ test_events(override_with_spec) ->
        {?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g3,[sequence]},ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t31,ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t32,{failed,{error,crashes}}}},
-       {?eh,tc_auto_skip,{groups_spec_1_SUITE,t33,{failed,{groups_spec_1_SUITE,t32}}}},
+       {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t33,g3},
+			  {failed,{groups_spec_1_SUITE,t32}}}},
        {?eh,test_stats,{14,9,{0,2}}},
        {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]}}},
        {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]},ok}}],
       {?eh,tc_done,{groups_spec_1_SUITE,t22,{failed,{error,crashes}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t41,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t51,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t52,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t53,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t54,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t42,{failed,{groups_spec_1_SUITE,t22}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t23,{failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t41,g4},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t51,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t52,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t53,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t54,g5},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t42,g4},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t23,g2},
+			 {failed,{groups_spec_1_SUITE,t22}}}},
       {?eh,test_stats,{14,10,{0,9}}},
       {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g2,[sequence]}}},
       {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g2,[sequence]},ok}}],
@@ -521,7 +542,8 @@ test_events(override_with_spec) ->
        {?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g3,[sequence]},ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t31,ok}},
        {?eh,tc_done,{groups_spec_1_SUITE,t32,{failed,{error,crashes}}}},
-       {?eh,tc_auto_skip,{groups_spec_1_SUITE,t33,{failed,{groups_spec_1_SUITE,t32}}}},
+       {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t33,g3},
+			  {failed,{groups_spec_1_SUITE,t32}}}},
        {?eh,test_stats,{16,11,{0,10}}},
        {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]}}},
        {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g3,[sequence]},ok}}],
@@ -535,8 +557,10 @@ test_events(override_with_spec) ->
 	{?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g5,[sequence]},ok}},
 	{?eh,tc_done,{groups_spec_1_SUITE,t51,ok}},
 	{?eh,tc_done,{groups_spec_1_SUITE,t52,{failed,{timetrap_timeout,2000}}}},
-	{?eh,tc_auto_skip,{groups_spec_1_SUITE,t53,{failed,{groups_spec_1_SUITE,t52}}}},
-	{?eh,tc_auto_skip,{groups_spec_1_SUITE,t54,{failed,{groups_spec_1_SUITE,t52}}}},
+	{?eh,tc_auto_skip,{groups_spec_1_SUITE,{t53,g5},
+			   {failed,{groups_spec_1_SUITE,t52}}}},
+	{?eh,tc_auto_skip,{groups_spec_1_SUITE,{t54,g5},
+			   {failed,{groups_spec_1_SUITE,t52}}}},
 	{?eh,test_stats,{18,13,{0,12}}},
 	{?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g5,[sequence]}}},
 	{?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g5,[sequence]},ok}}],
@@ -555,7 +579,8 @@ test_events(override_with_spec) ->
      [{?eh,tc_start,{groups_spec_1_SUITE,{init_per_group,g1,[sequence]}}},
       {?eh,tc_done,{groups_spec_1_SUITE,{init_per_group,g1,[sequence]},ok}},
       {?eh,tc_done,{groups_spec_1_SUITE,t12,{failed,{error,crashes}}}},
-      {?eh,tc_auto_skip,{groups_spec_1_SUITE,t13,{failed,{groups_spec_1_SUITE,t12}}}},
+      {?eh,tc_auto_skip,{groups_spec_1_SUITE,{t13,g1},
+			 {failed,{groups_spec_1_SUITE,t12}}}},
       {?eh,test_stats,{19,15,{0,13}}},
       {?eh,tc_start,{groups_spec_1_SUITE,{end_per_group,g1,[sequence]}}},
       {?eh,tc_done,{groups_spec_1_SUITE,{end_per_group,g1,[sequence]},ok}}],
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index b5855da9df..c8fc4bd59b 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -786,7 +786,7 @@ test_events(skip_pre_end_cth) ->
       {?eh,cth,{'_',post_end_per_group,[group1,'$proplist','_',[]]}},
       {?eh,tc_done,{ct_scope_per_group_cth_SUITE,{end_per_group,group1,[]},
 		    {skipped,"Test skip"}}}],
-      {?eh,cth,{'_',on_tc_skip,[end_per_group,
+      {?eh,cth,{'_',on_tc_skip,[{end_per_group,group1},
 				{tc_user_skip,{skipped,"Test skip"}},
 				[]]}},
      {?eh,tc_start,{ct_scope_per_group_cth_SUITE,end_per_suite}},
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index 9ee2a90896..6caac7e447 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -229,9 +229,9 @@ post_end_per_testcase(TC,Config,Return,State) ->
 %% This function should be used for extra cleanup which might be needed.
 %% It is not possible to modify the config or the status of the test run.
 -spec on_tc_fail(TC :: init_per_suite | end_per_suite |
-		 init_per_group | end_per_group | atom(),
-		 Reason :: term(), State :: #state{}) ->
-    NewState :: #state{}.
+		       init_per_group | end_per_group | atom() |
+		       {Function :: atom(), GroupName :: atom()},
+		 Reason :: term(), State :: #state{}) -> NewState :: #state{}.
 on_tc_fail(TC, Reason, State) ->
     gen_event:notify(
       ?CT_EVMGR_REF, #event{ name = cth, node = node(),
@@ -243,11 +243,11 @@ on_tc_fail(TC, Reason, State) ->
 %% or due to an init function failing. Test case can be
 %% end_per_suite, init_per_group, end_per_group and the actual test cases. 
 -spec on_tc_skip(TC :: end_per_suite |
-		 init_per_group | end_per_group | atom(),
+		       init_per_group | end_per_group | atom() |
+		       {Function :: atom(), GroupName :: atom()},
 		 {tc_auto_skip, {failed, {Mod :: atom(), Function :: atom(), Reason :: term()}}} |
-         {tc_user_skip, {skipped, Reason :: term()}},
-          State :: #state{}) ->
-    NewState :: #state{}.
+		 {tc_user_skip, {skipped, Reason :: term()}},
+		 State :: #state{}) -> NewState :: #state{}.
 on_tc_skip(TC, Reason, State) ->
     gen_event:notify(
       ?CT_EVMGR_REF, #event{ name = cth, node = node(),
diff --git a/lib/common_test/test/ct_repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE.erl
index 98eaa28763..e37aeb196c 100644
--- a/lib/common_test/test/ct_repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_1_SUITE.erl
@@ -225,7 +225,7 @@ test_events(repeat_cs_and_grs) ->
       {?eh,test_stats,{3,1,{0,0}}},
       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
 		     {failed,{error,fails_on_purpose}}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_fail_init},
 			  {failed,{repeat_1_SUITE,init_per_group,
 				   {'EXIT',fails_on_purpose}}}}},
        {?eh,test_stats,{3,1,{0,1}}},
@@ -247,7 +247,7 @@ test_events(repeat_cs_and_grs) ->
       {?eh,test_stats,{7,2,{0,1}}},
       [{?eh,tc_done,{repeat_1_SUITE,{init_per_group,gr_fail_init,[]},
 		     {failed,{error,fails_on_purpose}}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_fail_init},
 			  {failed,{repeat_1_SUITE,init_per_group,
 				   {'EXIT',fails_on_purpose}}}}},
        {?eh,test_stats,{7,2,{0,2}}},
@@ -269,7 +269,7 @@ test_events(repeat_seq) ->
 		     ok}},
        {?eh,test_stats,{1,0,{0,0}}},
        {?eh,test_stats,{1,1,{0,0}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_2,repeat_seq_1},
 			  {failed,{repeat_1_SUITE,tc_fail_1}}}},
        {?eh,test_stats,{1,1,{0,1}}},
        {?eh,tc_done,{repeat_1_SUITE,
@@ -291,7 +291,7 @@ test_events(repeat_seq) ->
 	{?eh,tc_done,{repeat_1_SUITE,
 		      {end_per_group,gr_fail_result,[]},
 		      {return_group_result,failed}}}],
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_2,repeat_seq_2},
 			  {group_result,gr_fail_result,failed}}},
        {?eh,test_stats,{4,2,{0,3}}},
        {?eh,tc_done,{repeat_1_SUITE,
@@ -315,7 +315,7 @@ test_events(repeat_seq) ->
 			   {failed,
 			    {repeat_1_SUITE,init_per_group,
 			     {'EXIT',fails_on_purpose}}}}}],
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_2,repeat_seq_3},
 			  {group_result,gr_fail_init,failed}}},
        {?eh,test_stats,{7,2,{0,6}}},
        {?eh,tc_done,{repeat_1_SUITE,
@@ -329,12 +329,13 @@ test_events(repeat_seq) ->
       [{?eh,tc_done,{repeat_1_SUITE,
 		     {init_per_group,repeat_seq_4,[sequence,{repeat,2}]},
 		     ok}},
+       {?eh,tc_done,{repeat_1_SUITE,tc_fail_1,'_'}},
        {?eh,test_stats,{8,3,{0,8}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,
-			  tc_ok_1,{failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_ok_1},
+			  {failed,{repeat_1_SUITE,tc_fail_1}}}},
        {?eh,test_stats,{8,3,{0,9}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,
-			  tc_ok_1,{failed,{repeat_1_SUITE,tc_fail_1}}}},
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,repeat_seq_4},
+			  {failed,{repeat_1_SUITE,tc_fail_1}}}},
        {?eh,test_stats,{8,3,{0,10}}},
        {?eh,tc_done,{repeat_1_SUITE,
 		     {end_per_group,repeat_seq_4,[sequence,{repeat,2}]},
@@ -764,7 +765,7 @@ test_events(repeat_gr_until_any_fail) ->
               {init_per_group,gr_ok_then_fail_init,[]},
               {failed,{error,failing_this_time}}}},
        {?eh,tc_auto_skip,
-           {repeat_1_SUITE,tc_ok_1,
+           {repeat_1_SUITE,{tc_ok_1,gr_ok_then_fail_init},
                {failed,
                    {repeat_1_SUITE,init_per_group,
                        {'EXIT',failing_this_time}}}}},
@@ -963,7 +964,7 @@ test_events(repeat_gr_until_all_ok) ->
        [{?eh,tc_done,{repeat_1_SUITE,
 		      {init_per_group,gr_fail_init_then_ok,[]},
 		      {failed,{error,failing_this_time}}}},
-	{?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+	{?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_fail_init_then_ok},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',failing_this_time}}}}},
 	{?eh,test_stats,{7,1,{0,1}}},
@@ -1237,10 +1238,10 @@ test_events(repeat_seq_until_any_fail) ->
        {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
 		     {failed,{error,failing_this_time}}}},
        {?eh,test_stats,{15,1,{0,0}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_2,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_2,repeat_seq_until_any_fail_3},
 			  {failed,{repeat_1_SUITE,tc_ok_then_fail_1}}}},
        {?eh,test_stats,{15,1,{0,1}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_ok_1},
 			  {failed,{repeat_1_SUITE,tc_ok_then_fail_1}}}},
        {?eh,test_stats,{15,1,{0,2}}},
        {?eh,tc_done,{repeat_1_SUITE,
@@ -1264,10 +1265,10 @@ test_events(repeat_seq_until_any_fail) ->
        [{?eh,tc_done,{repeat_1_SUITE,
 		      {end_per_group,gr_ok_then_fail_result,[]},
 		      {return_group_result,failed}}}],
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_ok_1},
 			  {group_result,gr_ok_then_fail_result,failed}}},
        {?eh,test_stats,{19,1,{0,3}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,repeat_seq_until_any_fail_4},
 			  {group_result,gr_ok_then_fail_result,failed}}},
        {?eh,test_stats,{19,1,{0,4}}},
        {?eh,tc_done,{repeat_1_SUITE,
@@ -1296,10 +1297,10 @@ test_events(repeat_seq_until_any_fail) ->
 	{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',failing_this_time}}}}}],
-       {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,gr_ok_2},
 			  {group_result,gr_ok_then_fail_init,failed}}},
        {?eh,test_stats,{24,1,{0,6}}},
-      {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
+      {?eh,tc_auto_skip,{repeat_1_SUITE,{tc_ok_1,repeat_seq_until_any_fail_5},
 			 {group_result,gr_ok_then_fail_init,failed}}},
        {?eh,test_stats,{24,1,{0,7}}},
        {?eh,tc_done,{repeat_1_SUITE,
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
index bb2aba2c5a..b6f285322d 100644
--- a/lib/common_test/test/ct_repeat_testrun_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
@@ -343,9 +343,9 @@ skip_first_tc1(Suite) ->
      {?eh,tc_done,{Suite,tc2,?skipped}},
      {?eh,test_stats,{'_',0,{0,1}}},
      {?eh,tc_done,{Suite,{init_per_group,g,[]},?skipped}},
-     {?eh,tc_auto_skip,{Suite,tc1,?skip_reason}},
+     {?eh,tc_auto_skip,{Suite,{tc1,g},?skip_reason}},
      {?eh,test_stats,{'_',0,{0,2}}},
-     {?eh,tc_auto_skip,{Suite,tc2,?skip_reason}},
+     {?eh,tc_auto_skip,{Suite,{tc2,g},?skip_reason}},
      {?eh,test_stats,{'_',0,{0,3}}},
      {?eh,tc_auto_skip,{Suite,{end_per_group,g},?skip_reason}},
      {?eh,tc_done,{Suite,tc2,?skipped}},
diff --git a/lib/common_test/test/ct_sequence_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE.erl
index 8c87236838..5a775a1117 100644
--- a/lib/common_test/test/ct_sequence_1_SUITE.erl
+++ b/lib/common_test/test/ct_sequence_1_SUITE.erl
@@ -185,7 +185,8 @@ test_events(subgroup_return_fail) ->
        {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},
 		     {return_group_result,failed}}}],
       {?eh,tc_auto_skip,
-       {subgroups_1_SUITE,ok_tc,{group_result,return_fail,failed}}},
+       {subgroups_1_SUITE,{ok_tc,ok_group},
+	{group_result,return_fail,failed}}},
       {?eh,test_stats,{0,1,{0,1}}},
       {?eh,tc_start,
        {subgroups_1_SUITE,{end_per_group,subgroup_return_fail,[sequence]}}},
@@ -208,14 +209,15 @@ test_events(subgroup_init_fail) ->
       [{?eh,tc_start,{subgroups_1_SUITE,{init_per_group,fail_init,[]}}},
        {?eh,tc_done,{subgroups_1_SUITE,{init_per_group,fail_init,[]},
 		     {failed,{error,init_per_group_fails_on_purpose}}}},
-       {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,{ok_tc,fail_init},
 			  {failed,{subgroups_1_SUITE,init_per_group,
 				   {'EXIT',init_per_group_fails_on_purpose}}}}},
        {?eh,test_stats,{0,0,{0,1}}},
        {?eh,tc_auto_skip,{subgroups_1_SUITE,{end_per_group,fail_init},
              {failed,{subgroups_1_SUITE,init_per_group,
 		      {'EXIT',init_per_group_fails_on_purpose}}}}}],
-      {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,{group_result,fail_init,failed}}},
+      {?eh,tc_auto_skip,{subgroups_1_SUITE,{ok_tc,ok_group},
+			 {group_result,fail_init,failed}}},
       {?eh,test_stats,{0,0,{0,2}}},
       {?eh,tc_start,{subgroups_1_SUITE,{end_per_group,subgroup_init_fail,[sequence]}}},
       {?eh,tc_done,{subgroups_1_SUITE,
@@ -237,7 +239,8 @@ test_events(subgroup_after_failed_case) ->
       {?eh,tc_start,{subgroups_1_SUITE,failing_tc}},
       {?eh,tc_done,{subgroups_1_SUITE,failing_tc,{failed,{error,{{badmatch,3},'_'}}}}},
       {?eh,test_stats,{0,1,{0,0}}},
-      {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,{failed,{subgroups_1_SUITE,failing_tc}}}},
+      {?eh,tc_auto_skip,{subgroups_1_SUITE,{ok_tc,ok_group},
+			 {failed,{subgroups_1_SUITE,failing_tc}}}},
       {?eh,test_stats,{0,1,{0,1}}},
       {?eh,tc_start,{subgroups_1_SUITE,
 		     {end_per_group,subgroup_after_failed_case,[sequence]}}},
@@ -265,7 +268,8 @@ test_events(case_after_subgroup_return_fail) ->
        {?eh,tc_start,{subgroups_1_SUITE,{end_per_group,return_fail,[]}}},
        {?eh,tc_done,{subgroups_1_SUITE,{end_per_group,return_fail,[]},
 		     {return_group_result,failed}}}],
-      {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,{group_result,return_fail,failed}}},
+      {?eh,tc_auto_skip,{subgroups_1_SUITE,{ok_tc,case_after_subgroup_return_fail},
+			 {group_result,return_fail,failed}}},
       {?eh,test_stats,{0,1,{0,1}}},
       {?eh,tc_start,{subgroups_1_SUITE,
 		     {end_per_group,case_after_subgroup_return_fail,[sequence]}}},
@@ -289,7 +293,7 @@ test_events(case_after_subgroup_fail_init) ->
        {?eh,tc_done,{subgroups_1_SUITE,
 		     {init_per_group,fail_init,[]},
 		     {failed,{error,init_per_group_fails_on_purpose}}}},
-       {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,{ok_tc,fail_init},
 			  {failed,
 			   {subgroups_1_SUITE,init_per_group,
 			    {'EXIT',init_per_group_fails_on_purpose}}}}},
@@ -300,7 +304,8 @@ test_events(case_after_subgroup_fail_init) ->
 			    {'EXIT',init_per_group_fails_on_purpose}}}}}],
 
       {?eh,tc_auto_skip,
-       {subgroups_1_SUITE,ok_tc,{group_result,fail_init,failed}}},
+       {subgroups_1_SUITE,{ok_tc,case_after_subgroup_fail_init},
+	{group_result,fail_init,failed}}},
       {?eh,test_stats,{0,0,{0,2}}},
       {?eh,tc_start,{subgroups_1_SUITE,
 		     {end_per_group,case_after_subgroup_fail_init,[sequence]}}},
diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl
index b0a6c839a2..6fb803b928 100644
--- a/lib/common_test/test/ct_skip_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE.erl
@@ -153,10 +153,10 @@ testspec_skip(Config) when is_list(Config) ->
 		 {skip_groups, TestDir, user_skip_6_SUITE, psub1, "SKIPPED"}],
 
     {Opts,ERPid} = setup_testspec([{ts1,TestSpec1},
-				   {ts2,TestSpec2},
-				   {ts3,TestSpec3},
-				   {ts4,TestSpec4},
-				   {ts5,TestSpec5}], Config),
+    				   {ts2,TestSpec2},
+    				   {ts3,TestSpec3},
+    				   {ts4,TestSpec4},
+    				   {ts5,TestSpec5}], Config),
 
     ok = ct_test_support:run(Opts, Config),
 
@@ -234,8 +234,8 @@ test_events(auto_skip) ->
      {?eh,tc_done,
       {auto_skip_2_SUITE,init_per_suite,{failed,{error,init_per_suite_failed}}}},
      {?eh,tc_auto_skip,      
-      {auto_skip_2_SUITE,tc1,{failed,{auto_skip_2_SUITE,init_per_suite,
-				      {'EXIT',init_per_suite_failed}}}}},
+      {auto_skip_2_SUITE,{tc1,g1},{failed,{auto_skip_2_SUITE,init_per_suite,
+					   {'EXIT',init_per_suite_failed}}}}},
      {?eh,test_stats,{0,0,{0,3}}},
      {?eh,tc_auto_skip,
       {auto_skip_2_SUITE,end_per_suite,{failed,{auto_skip_2_SUITE,init_per_suite,
@@ -274,12 +274,12 @@ test_events(auto_skip) ->
       {?eh,tc_done,
        {auto_skip_5_SUITE,{init_per_group,g1,[]},{failed,{error,{group,g1,failed}}}}},
       {?eh,tc_auto_skip,
-       {auto_skip_5_SUITE,tc1,{failed,{auto_skip_5_SUITE,init_per_group,
-				       {'EXIT',{group,g1,failed}}}}}},
+       {auto_skip_5_SUITE,{tc1,g1},{failed,{auto_skip_5_SUITE,init_per_group,
+					    {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,6}}},    
       {?eh,tc_auto_skip,
-       {auto_skip_5_SUITE,tc2,{failed,{auto_skip_5_SUITE,init_per_group,
-				       {'EXIT',{group,g1,failed}}}}}},
+       {auto_skip_5_SUITE,{tc2,g1},{failed,{auto_skip_5_SUITE,init_per_group,
+					    {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,7}}},
       {?eh,tc_auto_skip,
        {auto_skip_5_SUITE,{end_per_group,g1},
@@ -295,20 +295,20 @@ test_events(auto_skip) ->
       {?eh,tc_done,
        {auto_skip_6_SUITE,{init_per_group,g1,[]},{failed,{error,{group,g1,failed}}}}},
       {?eh,tc_auto_skip,
-       {auto_skip_6_SUITE,tc1,{failed,{auto_skip_6_SUITE,init_per_group,
-				       {'EXIT',{group,g1,failed}}}}}},
+       {auto_skip_6_SUITE,{tc1,g1},{failed,{auto_skip_6_SUITE,init_per_group,
+					    {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,8}}},
       {?eh,tc_auto_skip,
-       {auto_skip_6_SUITE,tc3,{failed,{auto_skip_6_SUITE,init_per_group,
-				       {'EXIT',{group,g1,failed}}}}}},
+       {auto_skip_6_SUITE,{tc3,g2},{failed,{auto_skip_6_SUITE,init_per_group,
+					    {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,9}}},
       {?eh,tc_auto_skip,
-       {auto_skip_6_SUITE,tc4,{failed,{auto_skip_6_SUITE,init_per_group,
-				       {'EXIT',{group,g1,failed}}}}}},
+       {auto_skip_6_SUITE,{tc4,g2},{failed,{auto_skip_6_SUITE,init_per_group,
+					    {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,10}}},
       {?eh,tc_auto_skip,
-       {auto_skip_6_SUITE,tc2,{failed,{auto_skip_6_SUITE,init_per_group,
-				       {'EXIT',{group,g1,failed}}}}}},
+       {auto_skip_6_SUITE,{tc2,g1},{failed,{auto_skip_6_SUITE,init_per_group,
+					    {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,11}}},
       {?eh,tc_auto_skip,
        {auto_skip_6_SUITE,{end_per_group,g1},
@@ -324,12 +324,12 @@ test_events(auto_skip) ->
        {?eh,tc_done,{auto_skip_6_SUITE,{init_per_group,g4,[]},
 		     {failed,{error,{group,g4,failed}}}}},
        {?eh,tc_auto_skip,
-	{auto_skip_6_SUITE,tc3,{failed,{auto_skip_6_SUITE,init_per_group,
-					{'EXIT',{group,g4,failed}}}}}},
+	{auto_skip_6_SUITE,{tc3,g4},{failed,{auto_skip_6_SUITE,init_per_group,
+					     {'EXIT',{group,g4,failed}}}}}},
        {?eh,test_stats,{3,0,{0,12}}},
        {?eh,tc_auto_skip,
-	{auto_skip_6_SUITE,tc4,{failed,{auto_skip_6_SUITE,init_per_group,
-					{'EXIT',{group,g4,failed}}}}}},
+	{auto_skip_6_SUITE,{tc4,g4},{failed,{auto_skip_6_SUITE,init_per_group,
+					     {'EXIT',{group,g4,failed}}}}}},
        {?eh,test_stats,{3,0,{0,13}}},
        {?eh,tc_auto_skip,
 	{auto_skip_6_SUITE,{end_per_group,g4},
@@ -498,13 +498,13 @@ test_events(auto_skip) ->
 				  [{suite,auto_skip_12_SUITE}]},
 		    {auto_skipped,
 		     {require_failed,{not_available,unknown_variable_g1}}}}},
-      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc1,
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,{tc1,g1},
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,25}}},
-      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc2,
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,{tc2,g1},
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,26}}},
-      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,{tc3,g2},
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,27}}},
       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g1},
@@ -516,13 +516,13 @@ test_events(auto_skip) ->
 				  [{suite,auto_skip_12_SUITE}]},
 		    {auto_skipped,
 		     {require_failed,{not_available,unknown_variable_g1}}}}},
-      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc1,
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,{tc1,g1},
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,28}}},
-      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc2,
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,{tc2,g1},
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,29}}},
-      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,{tc3,g2},
 			 {require_failed,{not_available,unknown_variable_g1}}}},
       {?eh,test_stats,{10,0,{0,30}}},
       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g1},
@@ -544,7 +544,7 @@ test_events(auto_skip) ->
 				   [{suite,auto_skip_12_SUITE}]},
 		     {auto_skipped,
 		      {require_failed,{not_available,unknown_variable_g4}}}}},
-       {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
+       {?eh,tc_auto_skip,{auto_skip_12_SUITE,{tc3,g4},
 			  {require_failed,{not_available,unknown_variable_g4}}}},
        {?eh,test_stats,{12,0,{0,31}}},
        {?eh,tc_auto_skip,{ct_framework,{end_per_group,g4},
@@ -574,10 +574,10 @@ test_events(user_skip) ->
       {user_skip_1_SUITE,tc1,"Whole suite skipped"}},
      {?eh,test_stats,{0,0,{1,0}}},
      {?eh,tc_user_skip,
-      {user_skip_1_SUITE,tc2,"Whole suite skipped"}},
+      {user_skip_1_SUITE,{tc2,g1},"Whole suite skipped"}},
      {?eh,test_stats,{0,0,{2,0}}},
      {?eh,tc_user_skip,
-      {user_skip_1_SUITE,tc3,"Whole suite skipped"}},
+      {user_skip_1_SUITE,{tc3,g1},"Whole suite skipped"}},
      {?eh,test_stats,{0,0,{3,0}}},
      {?eh,tc_user_skip,
       {user_skip_1_SUITE,tc4,"Whole suite skipped"}},
@@ -638,9 +638,9 @@ test_events(user_skip) ->
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g1,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g1,[]},{skipped,"Group skipped"}}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,tc1,"Group skipped"}},   
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{tc1,g1},"Group skipped"}},   
       {?eh,test_stats,{3,0,{10,0}}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,tc2,"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{tc2,g1},"Group skipped"}},
       {?eh,test_stats,{3,0,{11,0}}},
       {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g1},"Group skipped"}}],
 
@@ -657,10 +657,10 @@ test_events(user_skip) ->
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g3,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g3,[]},{skipped,"Group skipped"}}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,tc5,"Group skipped"}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,tc6,"Group skipped"}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,tc7,"Group skipped"}},
-      {?eh,tc_user_skip,{user_skip_4_SUITE,tc8,"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{tc5,g3},"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{tc6,g4},"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{tc7,g4},"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{tc8,g3},"Group skipped"}},
       {?eh,test_stats,{5,0,{15,0}}},
       {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g3},"Group skipped"}}],
 
@@ -671,9 +671,9 @@ test_events(user_skip) ->
       {?eh,test_stats,{6,0,{15,0}}},
       [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g6,[]}}},
        {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g6,[]},{skipped,"Group skipped"}}},
-       {?eh,tc_user_skip,{user_skip_4_SUITE,tc10,"Group skipped"}},
+       {?eh,tc_user_skip,{user_skip_4_SUITE,{tc10,g6},"Group skipped"}},
        {?eh,test_stats,{6,0,{16,0}}},
-       {?eh,tc_user_skip,{user_skip_4_SUITE,tc11,"Group skipped"}},
+       {?eh,tc_user_skip,{user_skip_4_SUITE,{tc11,g6},"Group skipped"}},
        {?eh,test_stats,{6,0,{17,0}}},
        {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g6},"Group skipped"}}],
        {?eh,tc_start,{user_skip_4_SUITE,{end_per_group,g5,[]}}},
@@ -687,9 +687,9 @@ test_events(user_skip) ->
 		   {skipped,{bad,'Whole suite skipped'}}}},
      {?eh,tc_user_skip,{user_skip_5_SUITE,tc1,{bad,'Whole suite skipped'}}},
      {?eh,test_stats,{6,0,{18,0}}},
-     {?eh,tc_user_skip,{user_skip_5_SUITE,tc2,{bad,'Whole suite skipped'}}},
+     {?eh,tc_user_skip,{user_skip_5_SUITE,{tc2,g1},{bad,'Whole suite skipped'}}},
      {?eh,test_stats,{6,0,{19,0}}},
-     {?eh,tc_user_skip,{user_skip_5_SUITE,tc3,{bad,'Whole suite skipped'}}},
+     {?eh,tc_user_skip,{user_skip_5_SUITE,{tc3,g1},{bad,'Whole suite skipped'}}},
      {?eh,test_stats,{6,0,{20,0}}},
      {?eh,tc_user_skip,{user_skip_5_SUITE,tc4,{bad,'Whole suite skipped'}}},
      {?eh,test_stats,{6,0,{21,0}}},
@@ -700,10 +700,10 @@ test_events(user_skip) ->
        {?eh,tc_done,{user_skip_6_SUITE,
 		     {init_per_group,ptop1,[parallel]},
 		     {skipped,"Top group skipped"}}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc1,"Top group skipped"}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"Top group skipped"}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"Top group skipped"}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc2,"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc1,ptop1},"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc3,psub1},"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc4,psub1},"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc2,ptop1},"Top group skipped"}},
        {?eh,tc_user_skip,{user_skip_6_SUITE,{end_per_group,ptop1},
 			  "Top group skipped"}}]},
       
@@ -718,8 +718,8 @@ test_events(user_skip) ->
 	 {?eh,tc_done,{user_skip_6_SUITE,
 		       {init_per_group,psub2,[parallel]},
 		       {skipped,"Sub group skipped"}}},
-	 {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"Sub group skipped"}},
-	 {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"Sub group skipped"}},
+	 {?eh,tc_user_skip,{user_skip_6_SUITE,{tc3,psub2},"Sub group skipped"}},
+	 {?eh,tc_user_skip,{user_skip_6_SUITE,{tc4,psub2},"Sub group skipped"}},
 	 {?eh,tc_user_skip,{user_skip_6_SUITE,{end_per_group,psub2},
 			    "Sub group skipped"}}]},
        
@@ -745,14 +745,14 @@ test_events(testspec_skip) ->
 	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]}}},
        {?eh,tc_done,
 	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]},ok}},
-       {?eh,tc_user_skip,{user_skip_7_SUITE,tc1,"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,{tc1,ptop1},"SKIPPED"}},
        {?eh,test_stats,{0,0,{1,0}}},
        {parallel,
 	[{?eh,tc_start,
           {user_skip_7_SUITE,{init_per_group,psub1,[parallel]}}},
 	 {?eh,tc_done,
           {user_skip_7_SUITE,{init_per_group,psub1,[parallel]},ok}},
-	 {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
+	 {?eh,tc_user_skip,{user_skip_7_SUITE,{tc3,psub1},"SKIPPED"}},
 	 {?eh,tc_start,{user_skip_7_SUITE,tc4}},
 	 {?eh,tc_done,{user_skip_7_SUITE,tc4,ok}},
 	 {?eh,test_stats,{1,0,{2,0}}},
@@ -778,13 +778,13 @@ test_events(testspec_skip) ->
      {?eh,tc_start,{ct_framework,init_per_suite}},
      {?eh,tc_done,{ct_framework,init_per_suite,ok}},
      {?eh,tc_user_skip,{user_skip_7_SUITE,{init_per_group,ptop1},"SKIPPED"}},
-     {?eh,tc_user_skip,{user_skip_7_SUITE,tc1,"SKIPPED"}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{tc1,ptop1},"SKIPPED"}},
      {?eh,test_stats,{0,0,{1,0}}},
-     {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{tc3,psub1},"SKIPPED"}},
      {?eh,test_stats,{0,0,{2,0}}},
-     {?eh,tc_user_skip,{user_skip_7_SUITE,tc4,"SKIPPED"}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{tc4,psub1},"SKIPPED"}},
      {?eh,test_stats,{0,0,{3,0}}},
-     {?eh,tc_user_skip,{user_skip_7_SUITE,tc2,"SKIPPED"}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{tc2,ptop1},"SKIPPED"}},
      {?eh,test_stats,{0,0,{4,0}}},
      {?eh,tc_user_skip,{user_skip_7_SUITE,{end_per_group,ptop1},"SKIPPED"}},
      {?eh,tc_start,{ct_framework,end_per_suite}},
@@ -804,8 +804,8 @@ test_events(testspec_skip) ->
 	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]},ok}},
        {?eh,tc_user_skip,
 	{user_skip_7_SUITE,{init_per_group,psub1},"SKIPPED"}},
-       {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
-       {?eh,tc_user_skip,{user_skip_7_SUITE,tc4,"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,{tc3,psub1},"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,{tc4,psub1},"SKIPPED"}},
        {?eh,test_stats,{0,0,{2,0}}},
        {?eh,tc_user_skip,{user_skip_7_SUITE,{end_per_group,psub1},"SKIPPED"}},
        {?eh,tc_start,{user_skip_7_SUITE,tc1}},
@@ -837,13 +837,13 @@ test_events(testspec_skip) ->
        {?eh,tc_done,{user_skip_6_SUITE,
 		     {init_per_group,ptop1,[parallel]},
 		     {skipped,"Top group skipped"}}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc1,"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc1,ptop1},"Top group skipped"}},
        {?eh,test_stats,{0,0,{1,0}}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc3,psub1},"SKIPPED"}},
        {?eh,test_stats,{0,0,{2,0}}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc4,psub1},"SKIPPED"}},
        {?eh,test_stats,{0,0,{3,0}}},
-       {?eh,tc_user_skip,{user_skip_6_SUITE,tc2,"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{tc2,ptop1},"Top group skipped"}},
        {?eh,test_stats,{0,0,{4,0}}},
        {?eh,tc_user_skip,
 	{user_skip_6_SUITE,{end_per_group,ptop1},"Top group skipped"}}]},
diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
index c5e44682b0..db7a0be915 100644
--- a/lib/common_test/test/ct_surefire_SUITE.erl
+++ b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -205,7 +205,7 @@ test_events(_) ->
      [{?eh,tc_start,{surefire_SUITE,{init_per_group,g_fail,[]}}},
       {?eh,tc_done,{surefire_SUITE,{init_per_group,g_fail,[]},
 		    {failed,{error,all_cases_should_be_skipped}}}},
-      {?eh,tc_auto_skip,{surefire_SUITE,tc_ok,
+      {?eh,tc_auto_skip,{surefire_SUITE,{tc_ok,g_fail},
 			 {failed,
 			  {surefire_SUITE,init_per_group,
 			   {'EXIT',all_cases_should_be_skipped}}}}},
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
index 9882fa980c..b6ef3062d4 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
@@ -168,7 +168,7 @@ test_events(ts_if_1) ->
       {?eh,tc_start,{ts_if_1_SUITE,tc4}},
       {?eh,tc_done,{ts_if_1_SUITE,tc4,{failed,{error,failed_on_purpose}}}},
       {?eh,test_stats,{1,3,{0,2}}},
-      {?eh,tc_auto_skip,{ts_if_1_SUITE,tc5,{failed,{ts_if_1_SUITE,tc4}}}},
+      {?eh,tc_auto_skip,{ts_if_1_SUITE,{tc5,seq2},{failed,{ts_if_1_SUITE,tc4}}}},
       {?eh,test_stats,{1,3,{0,3}}},
       {?eh,tc_start,{ts_if_1_SUITE,{end_per_group,seq2,[sequence]}}},
       {?eh,tc_done,{ts_if_1_SUITE,{end_per_group,seq2,[sequence]},ok}}],
@@ -199,7 +199,7 @@ test_events(ts_if_1) ->
      [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g1,[]}}},
       {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g1,[]},
 		    {skipped,g1_got_skipped}}},
-      {?eh,tc_user_skip,{ts_if_1_SUITE,gtc1,g1_got_skipped}},
+      {?eh,tc_user_skip,{ts_if_1_SUITE,{gtc1,g1},g1_got_skipped}},
       {?eh,test_stats,{1,4,{3,6}}},
       {?eh,tc_user_skip,{ts_if_1_SUITE,{end_per_group,g1},g1_got_skipped}}],
      
@@ -208,7 +208,7 @@ test_events(ts_if_1) ->
        {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g2,[parallel]},ok}},
        [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g3,[]}}},
     	{?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g3,[]},{skipped,g3_got_skipped}}},
-    	{?eh,tc_user_skip,{ts_if_1_SUITE,gtc2,g3_got_skipped}},
+    	{?eh,tc_user_skip,{ts_if_1_SUITE,{gtc2,g3},g3_got_skipped}},
     	{?eh,test_stats,{1,4,{4,6}}},
     	{?eh,tc_user_skip,{ts_if_1_SUITE,{end_per_group,g3},g3_got_skipped}}],
        {?eh,tc_start,{ts_if_1_SUITE,{end_per_group,g2,[parallel]}}},
@@ -279,7 +279,7 @@ test_events(ts_if_1) ->
 		   {init_per_group,g1,[]},
 		   {auto_skipped,{group0_failed,bad_return_value}}}},
      {?eh,tc_auto_skip,
-      {ts_if_7_SUITE,tc2,{group0_failed,bad_return_value}}},
+      {ts_if_7_SUITE,{tc2,g1},{group0_failed,bad_return_value}}},
      {?eh,test_stats,{2,7,{4,11}}},
      {?eh,tc_auto_skip,
       {ts_if_7_SUITE,{end_per_group,g1},{group0_failed,bad_return_value}}},
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
index 187b5e6d3a..c2670316b6 100644
--- a/lib/common_test/test/ct_testspec_1_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -763,35 +763,35 @@ test_events(skip_all_groups) ->
      {?eh,start_info,{1,1,12}},
      {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1a},"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1a,test_group_1a},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{1,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1b,test_group_1a},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{2,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1a},"SKIPPED!"}},
      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1b},"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1a,test_group_1b},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{3,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1b,test_group_1b},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{4,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1b},"SKIPPED!"}},
      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_2},"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_2a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_2a,test_group_2},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{5,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_3a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_3a,test_group_3},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{6,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_3b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_3b,test_group_3},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{7,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_2b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_2b,test_group_2},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{8,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_2},"SKIPPED!"}},
      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_4},"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_5a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_5a,test_group_5},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{9,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_7a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_7a,test_group_7},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{10,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_7b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_7b,test_group_7},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{11,0}}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_5b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_5b,test_group_5},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{12,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_4},"SKIPPED!"}},
      {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
@@ -826,17 +826,17 @@ test_events(skip_group) ->
        {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},ok}}],
       {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1b},
 			 "SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1a,test_group_1b},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1b,test_group_1b},"SKIPPED!"}},
       {?eh,test_stats,{2,0,{2,0}}},
       {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1b},
 			 "SKIPPED!"}},
       {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_2},
 			 "SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_11_SUITE,testcase_2a,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_11_SUITE,testcase_3a,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_11_SUITE,testcase_3b,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_11_SUITE,testcase_2b,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{testcase_2a,test_group_2},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{testcase_3a,test_group_3},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{testcase_3b,test_group_3},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{testcase_2b,test_group_2},"SKIPPED!"}},
       {?eh,test_stats,{2,0,{6,0}}},
       {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_2},
 			 "SKIPPED!"}},
@@ -864,15 +864,15 @@ test_events(skip_group_all_testcases) ->
      {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1a},
 			"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1a,test_group_1a},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1b,test_group_1a},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{2,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1a},
 			"SKIPPED!"}},
      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1b},
 			"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1a,test_group_1b},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1b,test_group_1b},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{4,0}}},
      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1b},
 			"SKIPPED!"}},
@@ -901,13 +901,13 @@ test_events(skip_group_testcase) ->
      
      {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
      {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1b,test_group_1a},"SKIPPED!"}},
      {?eh,test_stats,{1,0,{1,0}}},
      {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}},
      
      {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1b,[]}}},
      {?eh,tc_start,{groups_11_SUITE,testcase_1b}},
-     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{testcase_1a,test_group_1b},"SKIPPED!"}},
      {?eh,test_stats,{2,0,{2,0}}},
      {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1b,[]},'_'}},
 
@@ -1045,8 +1045,8 @@ test_events(skip_subgroup) ->
 
       	  {?eh,tc_user_skip,{groups_12_SUITE,
       			     {init_per_group,test_group_8},"SKIPPED!"}},
-      	  {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
-      	  {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
+      	  {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8a,test_group_8},"SKIPPED!"}},
+      	  {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8b,test_group_8},"SKIPPED!"}},
       	  {?eh,tc_user_skip,{groups_12_SUITE,
       			     {end_per_group,test_group_8},"SKIPPED!"}},
 
@@ -1146,12 +1146,12 @@ test_events(skip_subgroup_all_testcases) ->
       {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
       {?eh,tc_user_skip,{groups_12_SUITE,
 			 {init_per_group,test_group_5},"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_12_SUITE,testcase_5a,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_12_SUITE,testcase_7a,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_12_SUITE,testcase_7b,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
-      {?eh,tc_user_skip,{groups_12_SUITE,testcase_5b,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,{testcase_5a,test_group_5},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,{testcase_7a,test_group_7},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,{testcase_7b,test_group_7},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8a,test_group_8},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8b,test_group_8},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,{testcase_5b,test_group_5},"SKIPPED!"}},
       {?eh,test_stats,{0,0,{6,0}}},
       {?eh,tc_user_skip,{groups_12_SUITE,
 			 {end_per_group,test_group_5},"SKIPPED!"}},
@@ -1240,9 +1240,9 @@ test_events(skip_subgroup_testcase) ->
 	  {?eh,tc_done,
 	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
 	  [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,'_'}}},
-	   {?eh,tc_user_skip, {groups_12_SUITE,testcase_7a,"SKIPPED!"}},
+	   {?eh,tc_user_skip,{groups_12_SUITE,{testcase_7a,test_group_7},"SKIPPED!"}},
            {?eh,test_stats,{1,0,{1,0}}},
-           {?eh,tc_user_skip, {groups_12_SUITE,testcase_7b,"SKIPPED!"}},
+           {?eh,tc_user_skip, {groups_12_SUITE,{testcase_7b,test_group_7},"SKIPPED!"}},
            {?eh,test_stats,{1,0,{2,0}}},
 	   {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_7,'_'}}}],
 	  {shuffle,
@@ -1281,22 +1281,22 @@ test_events(sub_skipped_by_top) ->
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
      {?eh,tc_user_skip,{groups_12_SUITE,{init_per_group,test_group_4},
 			"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5a,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7a,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7b,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_5a,test_group_5},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_7a,test_group_7},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_7b,test_group_7},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8a,test_group_8},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8b,test_group_8},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_5b,test_group_5},"SKIPPED!"}},
      {?eh,tc_user_skip,{groups_12_SUITE,
 			{end_per_group,test_group_4},"SKIPPED!"}},
      {?eh,tc_user_skip,{groups_12_SUITE,
 			{init_per_group,test_group_4},"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5a,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7a,"SKIPPED!"}},     
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7b,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_5a,test_group_5},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_7a,test_group_7},"SKIPPED!"}},     
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_7b,test_group_7},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8a,test_group_8},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_8b,test_group_8},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,{testcase_5b,test_group_5},"SKIPPED!"}},
      {?eh,test_stats,{0,0,{12,0}}},
      {?eh,tc_user_skip,{groups_12_SUITE,
 			{end_per_group,test_group_4},"SKIPPED!"}},