Add ts_install_scb to suite/0

36 files changed, 110 insertions, 37 deletions

diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index d4912680ec..b4cf7c72e8 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -20,7 +20,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, failover/1, failover_comp/1, permissions/1, load/1,
+-export([all/0, suite/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,
@@ -41,6 +41,8 @@
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(2)).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [failover, failover_comp, permissions, load,
  load_use_cache, {group, reported_bugs}, start_phases,
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl
index c8ee765dba..668ee508c9 100644
--- a/lib/kernel/test/bif_SUITE.erl
+++ b/lib/kernel/test/bif_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(bif_SUITE).
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([ 
 	 spawn1/1, spawn2/1, spawn3/1, spawn4/1,
@@ -48,6 +48,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, spawn_tests}, {group, spawn_link_tests},
  {group, spawn_opt_tests}, spawn_failures, wilderness].
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 0f3a79f183..90b8a6a0d6 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -20,7 +20,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([set_path/1, get_path/1, add_path/1, add_paths/1, del_path/1,
 	 replace_path/1, load_file/1, load_abs/1, ensure_loaded/1,
 	 delete/1, purge/1, soft_purge/1, is_loaded/1, all_loaded/1,
@@ -43,6 +43,8 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     [set_path, get_path, add_path, add_paths, del_path,
      replace_path, load_file, load_abs, ensure_loaded,
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index e7647c251b..f5bb9e2886 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -34,7 +34,7 @@
 -define(datadir(Conf), ?config(data_dir, Conf)).
 -endif.
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
 
 	 halt_int_inf/1, 
 	 halt_int_sz_1/1, halt_int_sz_2/1,
@@ -142,6 +142,8 @@
 			  change_size_after, default_size]).
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, halt_int}, {group, wrap_int},
  {group, halt_ext}, {group, wrap_ext},
diff --git a/lib/kernel/test/erl_boot_server_SUITE.erl b/lib/kernel/test/erl_boot_server_SUITE.erl
index b9c632ed9a..4a3bf1d7a3 100644
--- a/lib/kernel/test/erl_boot_server_SUITE.erl
+++ b/lib/kernel/test/erl_boot_server_SUITE.erl
@@ -20,7 +20,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([start/1, start_link/1, stop/1, add/1, delete/1, responses/1]).
 
@@ -33,6 +33,8 @@
 %% Changed for the new erl_boot_server for R3A by Bjorn Gustavsson.
 %%-----------------------------------------------------------------
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [start, start_link, stop, add, delete, responses].
 
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 96589b6165..ac2cd9b6b9 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -21,7 +21,7 @@
 %-define(line_trace, 1).
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([tick/1, tick_change/1, illegal_nodenames/1, hidden_node/1,
 	 table_waste/1, net_setuptime/1,
@@ -57,6 +57,8 @@
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [tick, tick_change, illegal_nodenames, hidden_node,
  table_waste, net_setuptime, {group, monitor_nodes}].
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index e34663496a..58cb93383d 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -21,7 +21,7 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([init_per_testcase/2, end_per_testcase/2, whitebox/1, 
 	 switch_options/1, missing_compulsory_dflags/1]).
@@ -77,6 +77,8 @@
 -define(u32(X3,X2,X1,X0),
         (((X3) bsl 24) bor ((X2) bsl 16) bor ((X1) bsl 8) bor (X0))).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [whitebox, switch_options, missing_compulsory_dflags].
 
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index f68ce4f8f7..144e58460d 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -21,7 +21,7 @@
 -include_lib("kernel/include/file.hrl").
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([get_path/1, set_path/1, get_file/1,
 	 inet_existing/1, inet_coming_up/1, inet_disconnects/1,
@@ -35,6 +35,8 @@
 %% Test suite for erl_prim_loader. (Most code is run during system start/stop.)
 %%-----------------------------------------------------------------
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [get_path, set_path, get_file, inet_existing,
  inet_coming_up, inet_disconnects, multiple_slaves,
diff --git a/lib/kernel/test/error_logger_SUITE.erl b/lib/kernel/test/error_logger_SUITE.erl
index 90fdd4a00a..901877d43e 100644
--- a/lib/kernel/test/error_logger_SUITE.erl
+++ b/lib/kernel/test/error_logger_SUITE.erl
@@ -27,7 +27,7 @@
 %% error_logger deliver the expected events.
 %%-----------------------------------------------------------------
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, error_report/1, info_report/1, error/1, info/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, error_report/1, info_report/1, error/1, info/1,
 	 emulator/1, tty/1, logfile/1, add/1, delete/1]).
 
 -export([generate_error/0]).
@@ -37,6 +37,8 @@
 	 terminate/2]).
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [error_report, info_report, error, info, emulator, tty,
  logfile, add, delete].
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index 85a2a0a303..d7198ba333 100644
--- a/lib/kernel/test/error_logger_warn_SUITE.erl
+++ b/lib/kernel/test/error_logger_warn_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(error_logger_warn_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,
 	 basic/1,warnings_info/1,warnings_warnings/1,
 	 rb_basic/1,rb_warnings_info/1,rb_warnings_warnings/1,
 	 rb_trunc/1,rb_utc/1,file_utc/1]).
@@ -43,6 +43,8 @@
 -define(default_timeout, ?t:minutes(1)).
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [basic, warnings_info, warnings_warnings, rb_basic,
  rb_warnings_info, rb_warnings_warnings, rb_trunc,
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index c75b8c03a2..a34f7b9d05 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -40,7 +40,7 @@
 
 -module(?FILE_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init/1, fini/1,
 	 init_per_testcase/2, end_per_testcase/2,
 	 read_write_file/1, names/1]).
@@ -98,6 +98,8 @@
 
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [altname, read_write_file, {group, dirs},
  {group, files}, delete, rename, names, {group, errors},
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 9d1315c3ab..f4b242d155 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -70,7 +70,7 @@
 %% list_dir
 %% read_link
 
--export([all/0,groups/0,
+-export([all/0,groups/0,suite/0,
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([normal/1,icky/1,very_icky/1,normalize/1]).
@@ -84,6 +84,8 @@ end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     [normal, icky, very_icky, normalize].
 
@@ -96,7 +98,6 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
-
 normalize(suite) ->
     [];
 normalize(doc) ->
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 52f3a6b057..23cf136b4e 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -23,7 +23,7 @@
 
 %%-compile(export_all).
 
--export([all/0,groups/0,
+-export([all/0, suite/0,groups/0,
 	 init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
@@ -32,6 +32,8 @@
     api_open_close/1,api_listen/1,api_connect_init/1,api_opts/1,
     xfer_min/1,xfer_active/1,def_sndrcvinfo/1,implicit_inet6/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [basic, api_open_close, api_listen, api_connect_init,
  api_opts, xfer_min, xfer_active, def_sndrcvinfo,
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 233c2535b6..7f1e851656 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -25,13 +25,15 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
 	 t_connect_timeout/1, t_accept_timeout/1,
 	 t_connect_bad/1,
 	 t_recv_timeout/1, t_recv_eof/1,
 	 t_shutdown_write/1, t_shutdown_both/1, t_shutdown_error/1,
 	 t_fdopen/1, t_implicit_inet6/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, t_accept}, {group, t_connect}, {group, t_recv},
  t_shutdown_write, t_shutdown_both, t_shutdown_error,
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index 676dc1c593..fc75620bb2 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -22,7 +22,7 @@
 
 %%-compile(export_all).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
 	 active_echo/1, passive_echo/1, active_once_echo/1,
 	 slow_active_echo/1, slow_passive_echo/1,
 	 limit_active_echo/1, limit_passive_echo/1,
@@ -31,6 +31,8 @@
 -define(TPKT_VRSN, 3).
 -define(LINE_LENGTH, 1023). % (default value of gen_tcp option 'recbuf') - 1
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [active_echo, passive_echo, active_once_echo,
  slow_active_echo, slow_passive_echo, limit_active_echo,
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 02b243a0ce..f40c5afdfe 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -22,7 +22,7 @@
 
 %-compile(export_all).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, controlling_process/1, no_accept/1, close_with_pending_output/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, controlling_process/1, no_accept/1, close_with_pending_output/1,
 	 data_before_close/1, iter_max_socks/1, get_status/1,
 	 passive_sockets/1, accept_closed_by_other_process/1,
 	 init_per_testcase/2, end_per_testcase/2,
@@ -50,6 +50,8 @@ end_per_testcase(_Func, Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [controlling_process, no_accept,
  close_with_pending_output, data_before_close,
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index e9ae40b0cd..0d26ebd288 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -29,13 +29,15 @@
 % XXX - we should pick a port that we _know_ is closed. That's pretty hard.
 -define(CLOSED_PORT, 6666).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([send_to_closed/1, 
 	 buffer_size/1, binary_passive_recv/1, bad_address/1,
 	 read_packets/1, open_fd/1, connect/1, implicit_inet6/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [send_to_closed, buffer_size, binary_passive_recv,
  bad_address, read_packets, open_fd, connect,
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 887ce059d3..bb1ea83239 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -20,7 +20,7 @@
 
 %-define(line_trace, 1).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_suite/1, end_per_suite/1,
 	 names/1, names_hidden/1, locks/1, locks_hidden/1,
 	 bad_input/1, names_and_locks/1, lock_die/1, name_die/1,
@@ -60,6 +60,8 @@
 -define(GLOBAL_LOCK, global).
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 case init:get_argument(ring_line) of
   {ok, _} -> [ring_line];
diff --git a/lib/kernel/test/global_group_SUITE.erl b/lib/kernel/test/global_group_SUITE.erl
index a94944c0e9..651ca08c41 100644
--- a/lib/kernel/test/global_group_SUITE.erl
+++ b/lib/kernel/test/global_group_SUITE.erl
@@ -19,7 +19,7 @@
 
 -module(global_group_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_suite/1, end_per_suite/1]).
 -export([start_gg_proc/1, no_gg_proc/1, no_gg_proc_sync/1, compatible/1, 
 	 one_grp/1, one_grp_x/1, two_grp/1, hidden_groups/1, test_exit/1]).
@@ -35,6 +35,8 @@
 
 -define(UNTIL(Seq), loop_until_true(fun() -> Seq end)).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [start_gg_proc, no_gg_proc, no_gg_proc_sync, compatible,
  one_grp, one_grp_x, two_grp, test_exit, hidden_groups].
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index d811183a41..20b0bc8ea0 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -20,7 +20,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, ostype/1, start/1, restart/1, reboot/1, set_cmd/1, clear_cmd/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, ostype/1, start/1, restart/1, reboot/1, set_cmd/1, clear_cmd/1,
 	dont_drop/1, kill_pid/1, fini/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -53,6 +53,8 @@ end_per_testcase(_Func, Config) ->
 %% Should be started in a CC view with:
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [start, restart, reboot, set_cmd, clear_cmd, kill_pid].
 
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 596f31eb7e..ee4cf72fa5 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -22,7 +22,7 @@
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 t_gethostbyaddr/0, t_gethostbyaddr/1,
 	 t_getaddr/0, t_getaddr/1,
 	 t_gethostbyname/0, t_gethostbyname/1,
@@ -42,6 +42,8 @@
 	 kill_gethost/0, parallell_gethost/0]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     [t_gethostbyaddr, t_gethostbyname, t_getaddr,
      t_gethostbyaddr_v6, t_gethostbyname_v6, t_getaddr_v6,
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index 9c7f232631..ea1836dbd8 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -24,7 +24,7 @@
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([basic/1, resolve/1, edns0/1, txt_record/1, files_monitor/1]).
 -export([
@@ -40,6 +40,8 @@
 
 -define(RUN_NAMED, "run-named").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [basic, resolve, edns0, txt_record, files_monitor,
  gethostbyaddr, gethostbyaddr_v6, gethostbyname,
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index f9606ff15a..e24672ce1e 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -48,7 +48,7 @@
 
 -define(C_QUIT,99).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
 	 doc_examples_raw/1,doc_examples_raw_getbin/1,
 	 large_raw/1,large_raw_getbin/1,combined/1,combined_getbin/1,
 	 type_errors/1]).
@@ -56,6 +56,8 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [simple, loop_all, simple_raw, simple_raw_getbin,
  doc_examples_raw, doc_examples_raw_getbin, large_raw,
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index ecfc8f8fd0..0897697c42 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -20,7 +20,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
 -export([get_arguments/1, get_argument/1, boot_var/1, restart/1,
 	 get_plain_arguments/1,
@@ -38,6 +38,8 @@
 %% Should be started in a CC view with:
 %% erl -sname master -rsh ctrsh
 %%-----------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [get_arguments, get_argument, boot_var,
  get_plain_arguments, restart, get_status, script_id,
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index 8bf08a701a..a79aa56f8e 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(interactive_shell_SUITE).
 -include_lib("test_server/include/test_server.hrl").
--export([all/0,groups/0,init_per_group/2,end_per_group/2, get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
 	 job_control_remote/1,
 	 job_control_remote_noshell/1]).
 
@@ -44,6 +44,8 @@ end_per_testcase(_Func, Config) ->
     test_server:timetrap_cancel(Dog).
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [get_columns_and_rows, exit_initial, job_control_local,
  job_control_remote, job_control_remote_noshell].
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 3cf3723a85..0322056c46 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -27,7 +27,7 @@
 -define(default_timeout, ?t:minutes(1)).
 
 % Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases must be exported.
@@ -36,6 +36,8 @@
 %%
 %% all/1
 %%
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [app_test].
 
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index bfb86ebec4..a51d1dafd2 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -20,10 +20,12 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, sync/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, sync/1]).
 
 -export([init_per_suite/1, end_per_suite/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [sync].
 
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index a61c390cf3..45c4990036 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -18,12 +18,14 @@
 %%
 -module(os_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([space_in_cwd/1, quoting/1, space_in_name/1, bad_command/1,
 	 find_executable/1, unix_comment_in_command/1, evil/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [space_in_cwd, quoting, space_in_name, bad_command,
  find_executable, unix_comment_in_command, evil].
@@ -264,7 +266,9 @@ strip_nl([$\n])      -> [];
 strip_nl([H|T])      -> [H|strip_nl(T)];
 strip_nl([])         -> [].
 
-receive_all() ->
+receive_suite() -> [{suite_callbacks,[ts_install_scb]}].
+
+all() ->
     receive
 	X -> [X|receive_all()]
     after 0 -> []
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index 2d33487610..86c2cf6ce7 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -29,7 +29,7 @@
 -define(DEBUGF(A,B), noop).
 -endif.
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 simple/1, complicated/1, heavy/1, info/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([other_process/2]).
@@ -42,6 +42,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [simple, complicated, heavy, info].
 
diff --git a/lib/kernel/test/pg2_SUITE.erl b/lib/kernel/test/pg2_SUITE.erl
index cd9de48c63..8f7083388b 100644
--- a/lib/kernel/test/pg2_SUITE.erl
+++ b/lib/kernel/test/pg2_SUITE.erl
@@ -24,7 +24,7 @@
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
 
 -export([
              otp_7277/1, otp_8259/1, otp_8653/1,
@@ -49,6 +49,8 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, tickets}].
 
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 9d0d704b92..d53c17def4 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(prim_file_SUITE).
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	init/1, fini/1,
 	read_write_file/1]).
 -export([cur_dir_0a/1, cur_dir_0b/1, 
@@ -67,6 +67,8 @@
 	    _ ->  apply(?PRIM_FILE, F, [H | A])
 	end).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [read_write_file, {group, dirs}, {group, files},
  delete_a, delete_b, rename_a, rename_b, {group, errors},
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index 6b5df2a887..4045dbc784 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -19,7 +19,7 @@
 
 -module(ram_file_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 %% init/1, fini/1,
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([open_modes/1, open_old_modes/1, pread_pwrite/1, position/1,
@@ -34,6 +34,8 @@
 
 %%--------------------------------------------------------------------------
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [open_modes, open_old_modes, pread_pwrite, position,
  truncate, sync, get_set_file, compress, uuencode,
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index 4c31924052..f7553f0346 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(rpc_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([call/1, block_call/1, multicall/1, multicall_timeout/1, 
 	 multicall_dies/1, multicall_node_dies/1,
 	 called_dies/1, called_node_dies/1, 
@@ -28,6 +28,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [call, block_call, multicall, multicall_timeout,
  multicall_dies, multicall_node_dies, called_dies,
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index c7736b3f27..53a6e72fb0 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(seq_trace_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
 -export([token_set_get/1, tracer_set_get/1, print/1,
 	 send/1, distributed_send/1, recv/1, distributed_recv/1,
 	 trace_exit/1, distributed_exit/1, call/1, port/1,
@@ -34,6 +34,8 @@
 
 -define(default_timeout, ?t:minutes(1)).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [token_set_get, tracer_set_get, print, send,
  distributed_send, recv, distributed_recv, trace_exit,
diff --git a/lib/kernel/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl
index 616d777e9b..3ce2121bf9 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE.erl
@@ -33,7 +33,7 @@
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 no_file/1,
 	 one_empty/1, one_filled/1,
 	 two_filled/1,
@@ -45,6 +45,8 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [no_file, {group, one}, {group, two}, {group, four},
  {group, wrap}, wrapping, external, error].
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 135ef5ddaa..ffc50fc0c8 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -69,6 +69,8 @@ error(Format, Args, File, Line) ->
 %%     end,
 %%     log("<>ERROR<>~n" ++ Format, Args, File, Line).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, api}, {group, examples}, {group, func}, smp,
  otp_7359].