Add ts_install_scb to suite/0

57 files changed, 177 insertions, 65 deletions

diff --git a/lib/stdlib/test/array_SUITE.erl b/lib/stdlib/test/array_SUITE.erl
index 0cb5eb33b0..19ad86977d 100644
--- a/lib/stdlib/test/array_SUITE.erl
+++ b/lib/stdlib/test/array_SUITE.erl
@@ -27,7 +27,7 @@
 -define(default_timeout, ?t:seconds(60)).
 
 %% 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]).
 
 -export([
@@ -64,6 +64,8 @@
 %%
 %% all/1
 %%
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [new_test, fix_test, relax_test, resize_test,
  set_get_test, to_list_test, sparse_to_list_test,
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index c41cf2970a..146b63bc69 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -23,7 +23,7 @@
 -include("test_server_line.hrl").
 
 %% Test server specific exports
--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]).
 
 %% Test cases must be exported.
 -export([base64_encode/1, base64_decode/1, base64_otp_5635/1,
@@ -43,6 +43,8 @@ end_per_testcase(_, Config) ->
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
 %%-------------------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [base64_encode, base64_decode, base64_otp_5635,
  base64_otp_6279, big, illegal, mime_decode, mime_decode_to_string, roundtrip].
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index cf4de516a6..539028d4aa 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -32,11 +32,13 @@
 -define(privdir, ?config(priv_dir, Conf)).
 -endif.
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, normal/1, error/1, cmp/1, cmp_literals/1, strip/1, otp_6711/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, normal/1, error/1, cmp/1, cmp_literals/1, strip/1, otp_6711/1,
          building/1, md5/1, encrypted_abstr/1, encrypted_abstr_file/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [error, normal, cmp, cmp_literals, strip, otp_6711,
  building, md5, encrypted_abstr, encrypted_abstr_file].
diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index ec4894a2fa..b459f35f03 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(binary_module_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, interesting/1,random_ref_comp/1,random_ref_sr_comp/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, interesting/1,random_ref_comp/1,random_ref_sr_comp/1,
 	 random_ref_fla_comp/1,parts/1, bin_to_list/1, list_to_bin/1,
 	 copy/1, referenced/1,guard/1,encode_decode/1,badargs/1,longest_common_trap/1]).
 
@@ -62,6 +62,8 @@ end_per_testcase(_Case, Config) ->
     ok.
 -endif.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [interesting, random_ref_fla_comp, random_ref_sr_comp,
  random_ref_comp, parts, bin_to_list, list_to_bin, copy,
diff --git a/lib/stdlib/test/c_SUITE.erl b/lib/stdlib/test/c_SUITE.erl
index 4649bcb856..913bc104cd 100644
--- a/lib/stdlib/test/c_SUITE.erl
+++ b/lib/stdlib/test/c_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(c_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([c_1/1, c_2/1, c_3/1, c_4/1, nc_1/1, nc_2/1, nc_3/1, nc_4/1,
          memory/1]).
 
@@ -25,6 +25,8 @@
 
 -import(c, [c/2, nc/2]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [c_1, c_2, c_3, c_4, nc_1, nc_2, nc_3, nc_4, memory].
 
diff --git a/lib/stdlib/test/calendar_SUITE.erl b/lib/stdlib/test/calendar_SUITE.erl
index 12eae47474..12c38d3693 100644
--- a/lib/stdlib/test/calendar_SUITE.erl
+++ b/lib/stdlib/test/calendar_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, 
 	 gregorian_days/1,
 	 gregorian_seconds/1,
 	 day_of_the_week/1,
@@ -32,6 +32,8 @@
 -define(START_YEAR, 1947).			
 -define(END_YEAR, 2012).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [gregorian_days, gregorian_seconds, day_of_the_week,
  day_of_the_week_calibrate, leap_years,
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index e66afcdb9b..7f8231adff 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_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, not_run/1, newly_started/1, basic_v8/1, basic_v9/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, not_run/1, newly_started/1, basic_v8/1, basic_v9/1,
 	 open_v8/1, open_v9/1, sets_v8/1, sets_v9/1, bags_v8/1,
 	 bags_v9/1, duplicate_bags_v8/1, duplicate_bags_v9/1,
 	 access_v8/1, access_v9/1, dirty_mark/1, dirty_mark2/1,
@@ -88,6 +88,8 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     case os:type() of
 	vxworks -> [not_run];
diff --git a/lib/stdlib/test/dict_SUITE.erl b/lib/stdlib/test/dict_SUITE.erl
index d58b50f9a1..af1de5164f 100644
--- a/lib/stdlib/test/dict_SUITE.erl
+++ b/lib/stdlib/test/dict_SUITE.erl
@@ -22,13 +22,15 @@
 
 -module(dict_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,
 	 create/1,store/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 -import(lists, [foldl/3,reverse/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [create, store].
 
diff --git a/lib/stdlib/test/digraph_SUITE.erl b/lib/stdlib/test/digraph_SUITE.erl
index efebea5496..3bdb0ec0d2 100644
--- a/lib/stdlib/test/digraph_SUITE.erl
+++ b/lib/stdlib/test/digraph_SUITE.erl
@@ -26,7 +26,7 @@
 -include_lib("test_server/include/test_server.hrl").
 -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]).
 
 -export([opts/1, degree/1, path/1, cycle/1, vertices/1,
 	 edges/1, data/1, otp_3522/1, otp_3630/1, otp_8066/1]).
@@ -35,6 +35,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [opts, degree, path, cycle, {group, misc},
  {group, tickets}].
diff --git a/lib/stdlib/test/digraph_utils_SUITE.erl b/lib/stdlib/test/digraph_utils_SUITE.erl
index 4434b0db04..0204501ca0 100644
--- a/lib/stdlib/test/digraph_utils_SUITE.erl
+++ b/lib/stdlib/test/digraph_utils_SUITE.erl
@@ -25,7 +25,7 @@
 -include_lib("test_server/include/test_server.hrl").
 -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]).
 
 -export([simple/1, loop/1, isolated/1, topsort/1, subgraph/1, 
          condensation/1, tree/1]).
@@ -33,6 +33,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [simple, loop, isolated, topsort, subgraph,
  condensation, tree].
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index 38ea43999f..326942b99b 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(edlin_expand_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([normal/1, quoted_fun/1, quoted_module/1, quoted_both/1]).
 
@@ -36,6 +36,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [normal, quoted_fun, quoted_module, quoted_both].
 
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index bd39af68f0..f4579d7312 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 
 -module(epp_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([rec_1/1, predef_mac/1,
 	 upcase_mac_1/1, upcase_mac_2/1,
@@ -59,6 +59,8 @@ end_per_testcase(_, Config) ->
     ok.
 -endif.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     [rec_1, {group, upcase_mac}, predef_mac,
      {group, variable}, otp_4870, otp_4871, otp_5362, pmod,
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 756cefcf14..081ec6abb3 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 
 -module(erl_eval_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([guard_1/1, guard_2/1,
 	 match_pattern/1,
@@ -71,14 +71,14 @@ end_per_testcase(_Case, Config) ->
     ok.
 -endif.
 
-all(doc) ->
-    ["Test cases for the 'erl_eval' module."];
-all(suite) ->
-    [guard_1, guard_2, match_pattern, string_plusplus, pattern_expr,
-     match_bin, guard_3, guard_4, 
-     lc, simple_cases, unary_plus, apply_atom, otp_5269, otp_6539, otp_6543,
-     otp_6787, otp_6977, otp_7550, otp_8133, funs, try_catch, eval_expr_5,
-     zero_width].
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
+all() -> 
+[guard_1, guard_2, match_pattern, string_plusplus,
+ pattern_expr, match_bin, guard_3, guard_4, lc,
+ simple_cases, unary_plus, apply_atom, otp_5269,
+ otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
+ otp_8133, funs, try_catch, eval_expr_5, zero_width].
 
 groups() -> 
     [].
diff --git a/lib/stdlib/test/erl_expand_records_SUITE.erl b/lib/stdlib/test/erl_expand_records_SUITE.erl
index 6eb038c0be..d81d5ff6a2 100644
--- a/lib/stdlib/test/erl_expand_records_SUITE.erl
+++ b/lib/stdlib/test/erl_expand_records_SUITE.erl
@@ -31,7 +31,7 @@
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
 
--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([abstract_module/1, attributes/1, expr/1, guard/1,
          init/1, pattern/1, strict/1, update/1,
@@ -50,6 +50,8 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [abstract_module, attributes, expr, guard, init,
  pattern, strict, update, {group, tickets}].
diff --git a/lib/stdlib/test/erl_internal_SUITE.erl b/lib/stdlib/test/erl_internal_SUITE.erl
index 18a28c24dc..514d78b1d1 100644
--- a/lib/stdlib/test/erl_internal_SUITE.erl
+++ b/lib/stdlib/test/erl_internal_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(erl_internal_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([behav/1]).
 
@@ -26,6 +26,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [behav].
 
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index e7603ad8c1..3fcdade385 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -32,7 +32,7 @@
 -define(privdir, ?config(priv_dir, Conf)).
 -endif.
 
--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([ 
              unused_vars_warn_basic/1, 
@@ -69,6 +69,8 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, unused_vars_warn}, export_vars_warn,
  shadow_vars, unused_import, unused_function,
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 41e4443f89..9ee8e27068 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -35,7 +35,7 @@
 -define(privdir, ?config(priv_dir, Config)).
 -endif.
 
--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([ func/1, call/1, recs/1, try_catch/1, if_then/1,
             receive_after/1, bits/1, head_tail/1, package/1,
@@ -63,6 +63,8 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, expr}, {group, attributes}, hook, neg_indent,
  {group, tickets}].
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 5a98890ba7..030964163e 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 
 -module(erl_scan_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([ error_1/1, error_2/1, iso88591/1, otp_7810/1]).
 
@@ -55,6 +55,8 @@ end_per_testcase(_Case, Config) ->
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, error}, iso88591, otp_7810].
 
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl
index d9535ae3ae..3a955d5764 100644
--- a/lib/stdlib/test/escript_SUITE.erl
+++ b/lib/stdlib/test/escript_SUITE.erl
@@ -18,7 +18,7 @@
 
 -module(escript_SUITE).
 -export([
-	all/0,groups/0,init_per_group/2,end_per_group/2,
+	all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,
 	 end_per_testcase/2,
 	 basic/1,
@@ -38,6 +38,8 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     [basic, errors, strange_name, emulator_flags,
      module_script, beam_script, archive_script, epp,
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 0e605a1407..480883f4a5 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(ets_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([default/1,setbag/1,badnew/1,verybadnew/1,named/1,keypos2/1,
 	 privacy/1,privacy_owner/2]).
 -export([empty/1,badinsert/1]).
@@ -120,6 +120,8 @@ end_per_suite(_Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, new}, {group, insert}, {group, lookup},
  {group, delete}, firstnext, firstnext_concurrent, slot,
diff --git a/lib/stdlib/test/ets_tough_SUITE.erl b/lib/stdlib/test/ets_tough_SUITE.erl
index ef14403b0c..31e1585975 100644
--- a/lib/stdlib/test/ets_tough_SUITE.erl
+++ b/lib/stdlib/test/ets_tough_SUITE.erl
@@ -17,12 +17,14 @@
 %% %CopyrightEnd%
 %%
 -module(ets_tough_SUITE).
--export([all/0,groups/0,init_per_group/2,end_per_group/2,ex1/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,ex1/1]).
 -export([init/1,terminate/2,handle_call/3,handle_info/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -compile([export_all]).
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [ex1].
 
diff --git a/lib/stdlib/test/file_sorter_SUITE.erl b/lib/stdlib/test/file_sorter_SUITE.erl
index 050dac989b..27ba60c6a8 100644
--- a/lib/stdlib/test/file_sorter_SUITE.erl
+++ b/lib/stdlib/test/file_sorter_SUITE.erl
@@ -32,7 +32,7 @@
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, basic/1, badarg/1, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, basic/1, badarg/1, 
 	 term_sort/1, term_keysort/1,
 	 binary_term_sort/1, binary_term_keysort/1,
 	 binary_sort/1, 
@@ -55,6 +55,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [basic, badarg, term_sort, term_keysort,
  binary_term_sort, binary_term_keysort, binary_sort,
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl
index 4df5bc8106..249f399b4a 100644
--- a/lib/stdlib/test/filelib_SUITE.erl
+++ b/lib/stdlib/test/filelib_SUITE.erl
@@ -19,7 +19,7 @@
 
 -module(filelib_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,
 	 wildcard_one/1,wildcard_two/1,wildcard_errors/1,
 	 fold_files/1,otp_5960/1,ensure_dir_eexist/1]).
 
@@ -37,6 +37,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [wildcard_one, wildcard_two, wildcard_errors,
  fold_files, otp_5960, ensure_dir_eexist].
diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index e30fe2649c..728c6e9206 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(filename_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([absname/1, absname_2/1, 
 	 basename_1/1, basename_2/1,
 	 dirname/1, extension/1, join/1, t_nativename/1]).
@@ -29,6 +29,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     [absname, absname_2, basename_1, basename_2, dirname,
      extension,
diff --git a/lib/stdlib/test/fixtable_SUITE.erl b/lib/stdlib/test/fixtable_SUITE.erl
index 8259917c78..57894ab1f7 100644
--- a/lib/stdlib/test/fixtable_SUITE.erl
+++ b/lib/stdlib/test/fixtable_SUITE.erl
@@ -21,7 +21,7 @@
 %%%----------------------------------------------------------------------
 
 -module(fixtable_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]).
 %%% Test cases
 -export([multiple_fixes/1, multiple_processes/1,
 	 other_process_deletes/1, owner_dies/1,
@@ -31,6 +31,8 @@
 %%% Internal exports
 -export([command_loop/0,start_commander/0]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [multiple_fixes, multiple_processes,
  other_process_deletes, owner_dies, other_process_closes,
diff --git a/lib/stdlib/test/format_SUITE.erl b/lib/stdlib/test/format_SUITE.erl
index 5304eb2350..932d9b5278 100644
--- a/lib/stdlib/test/format_SUITE.erl
+++ b/lib/stdlib/test/format_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(format_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([hang_1/1]).
 
@@ -36,6 +36,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [hang_1].
 
diff --git a/lib/stdlib/test/gen_event_SUITE.erl b/lib/stdlib/test/gen_event_SUITE.erl
index 99caa72f6c..cba210ddc1 100644
--- a/lib/stdlib/test/gen_event_SUITE.erl
+++ b/lib/stdlib/test/gen_event_SUITE.erl
@@ -20,12 +20,14 @@
 
 -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, add_handler/1, add_sup_handler/1,
 	 delete_handler/1, swap_handler/1, swap_sup_handler/1,
 	 notify/1, sync_notify/1, call/1, info/1, hibernate/1,
 	 call_format_status/1, error_format_status/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [start, {group, test_all}, hibernate,
  call_format_status, error_format_status].
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index d487418adb..f97a85f315 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -21,7 +21,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% Test cases
--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([ start1/1, start2/1, start3/1, start4/1 , start5/1, start6/1,
 	 start7/1, start8/1, start9/1, start10/1, start11/1]).
@@ -53,6 +53,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, start}, {group, abnormal}, shutdown,
  {group, sys}, hibernate, enter_loop].
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 73407ce839..f30d0012ae 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -23,7 +23,7 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--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, crash/1, call/1, cast/1, cast_fast/1,
 	 info/1, abcast/1, multicall/1, multicall_down/1,
 	 call_remote1/1, call_remote2/1, call_remote3/1,
@@ -45,6 +45,8 @@
 -export([init/1, handle_call/3, handle_cast/2,
 	 handle_info/2, terminate/2, format_status/2]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [start, crash, call, cast, cast_fast, info, abcast,
  multicall, multicall_down, call_remote1, call_remote2,
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index 7c49dcdd1b..80c76015f2 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -21,7 +21,7 @@
 
 -include_lib("kernel/include/file.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,
 	 id_transform/1]).
 
 -export([check/2,check2/1,g/0,f/1,t/1,t1/1,t2/1,t3/1,t4/1,
@@ -31,6 +31,8 @@
 -hej(hopp).
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [id_transform].
 
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 91d1143545..19664922b8 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(io_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([init_per_testcase/2, end_per_testcase/2]).
 
@@ -54,6 +54,8 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [error_1, float_g, otp_5403, otp_5813, otp_6230,
  otp_6282, otp_6354, otp_6495, otp_6517, otp_6502,
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 1c9057a86e..56509881ff 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -19,7 +19,7 @@
 -module(io_proto_SUITE).
 -compile(r12).
 
--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]).
 
@@ -80,6 +80,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [setopts_getopts, unicode_options, unicode_options_gen,
  binary_options, bc_with_r12, bc_with_r12_gl,
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index aa690c4231..a86666e673 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -30,7 +30,7 @@
 -define(default_timeout, ?t:minutes(4)).
 
 % 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.
@@ -76,6 +76,8 @@
 %%
 %% all/1
 %%
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, append}, reverse, member, keymember,
  keysearch_keyfind, keystore, keytake, dropwhile, sort,
diff --git a/lib/stdlib/test/log_mf_h_SUITE.erl b/lib/stdlib/test/log_mf_h_SUITE.erl
index e39b4b9297..a2aaa1d0cf 100644
--- a/lib/stdlib/test/log_mf_h_SUITE.erl
+++ b/lib/stdlib/test/log_mf_h_SUITE.erl
@@ -21,7 +21,9 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, test/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, test/1]).
+
+suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
 [test].
diff --git a/lib/stdlib/test/ms_transform_SUITE.erl b/lib/stdlib/test/ms_transform_SUITE.erl
index 0e490d75ad..90b70e3933 100644
--- a/lib/stdlib/test/ms_transform_SUITE.erl
+++ b/lib/stdlib/test/ms_transform_SUITE.erl
@@ -21,7 +21,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([basic_ets/1]).
 -export([basic_dbg/1]).
 -export([from_shell/1]).
@@ -48,6 +48,8 @@ end_per_testcase(_Func, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [from_shell, basic_ets, basic_dbg, records,
  record_index, multipass, bitsyntax, record_defaults,
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index 9b8a78dfbb..429f1800aa 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -23,7 +23,7 @@
 %%
 %%-define(STANDALONE,1).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, crash/1, sync_start_nolink/1, sync_start_link/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, crash/1, sync_start_nolink/1, sync_start_link/1,
          spawn_opt/1, sp1/0, sp2/0, sp3/1, sp4/2, sp5/1,
 	 hibernate/1]).
 -export([ otp_6345/1]).
@@ -43,6 +43,8 @@
 -include_lib("test_server/include/test_server.hrl").
 -endif.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [crash, {group, sync_start}, spawn_opt, hibernate,
  {group, tickets}].
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index d34ceba4e6..2ce5d034aa 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -51,7 +51,7 @@
 
 -include_lib("stdlib/include/ms_transform.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]).
 
 -export([ 
              badarg/1, nested_qlc/1, unused_var/1, lc/1, fun_clauses/1,
@@ -119,6 +119,8 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, parse_transform}, {group, evaluation},
  {group, table_impls}, {group, join}, {group, tickets},
diff --git a/lib/stdlib/test/queue_SUITE.erl b/lib/stdlib/test/queue_SUITE.erl
index ed777df0a9..79853b470c 100644
--- a/lib/stdlib/test/queue_SUITE.erl
+++ b/lib/stdlib/test/queue_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(queue_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([do/1, to_list/1, io_test/1, op_test/1, error/1, oops/1]).
 
@@ -36,6 +36,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [do, to_list, io_test, op_test, error, oops].
 
diff --git a/lib/stdlib/test/random_SUITE.erl b/lib/stdlib/test/random_SUITE.erl
index ed56f8a8ac..8a284179d4 100644
--- a/lib/stdlib/test/random_SUITE.erl
+++ b/lib/stdlib/test/random_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 
 -module(random_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([interval_1/1, seed0/1, seed/1]).
 
@@ -36,6 +36,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [interval_1, seed0, seed].
 
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 9a174f2186..bd2d1d549c 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -18,11 +18,13 @@
 %%
 -module(re_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, pcre/1,compile_options/1,run_options/1,combined_options/1,replace_autogen/1,global_capture/1,replace_input_types/1,replace_return/1,split_autogen/1,split_options/1,split_specials/1,error_handling/1,pcre_cve_2008_2371/1,pcre_compile_workspace_overflow/1,re_infinite_loop/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, pcre/1,compile_options/1,run_options/1,combined_options/1,replace_autogen/1,global_capture/1,replace_input_types/1,replace_return/1,split_autogen/1,split_options/1,split_specials/1,error_handling/1,pcre_cve_2008_2371/1,pcre_compile_workspace_overflow/1,re_infinite_loop/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [pcre, compile_options, run_options, combined_options,
  replace_autogen, global_capture, replace_input_types,
diff --git a/lib/stdlib/test/select_SUITE.erl b/lib/stdlib/test/select_SUITE.erl
index 112e07bcfd..d8ed30b384 100644
--- a/lib/stdlib/test/select_SUITE.erl
+++ b/lib/stdlib/test/select_SUITE.erl
@@ -58,7 +58,7 @@ config(priv_dir,_) ->
     ".".
 -else.
 %% When run in test server.
--export([all/0,groups/0,init_per_group/2,end_per_group/2,select_test/1,init_per_testcase/2, end_per_testcase/2, 
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,select_test/1,init_per_testcase/2, end_per_testcase/2, 
 	 return_values/1]).
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
@@ -70,6 +70,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [return_values, select_test].
 
diff --git a/lib/stdlib/test/sets_SUITE.erl b/lib/stdlib/test/sets_SUITE.erl
index 54937afb33..18d6170540 100644
--- a/lib/stdlib/test/sets_SUITE.erl
+++ b/lib/stdlib/test/sets_SUITE.erl
@@ -22,7 +22,7 @@
 
 -module(sets_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,
 	 create/1,add_element/1,del_element/1,
 	 subtract/1,intersection/1,union/1,is_subset/1,
 	 is_set/1,fold/1,filter/1,
@@ -41,6 +41,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [create, add_element, del_element, subtract,
  intersection, union, is_subset, is_set, fold, filter,
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index c06bcb18ce..1b46a008a2 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(shell_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([forget/1, records/1, known_bugs/1, otp_5226/1, otp_5327/1,
                  otp_5435/1, otp_5195/1, otp_5915/1, otp_5916/1,
@@ -71,6 +71,8 @@ end_per_testcase(_Case, Config) ->
     ok.
 -endif.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [forget, records, known_bugs, otp_5226, otp_5327,
  otp_5435, otp_5195, otp_5915, otp_5916, {group, bits},
diff --git a/lib/stdlib/test/slave_SUITE.erl b/lib/stdlib/test/slave_SUITE.erl
index 94ba327f51..0ccd7ec553 100644
--- a/lib/stdlib/test/slave_SUITE.erl
+++ b/lib/stdlib/test/slave_SUITE.erl
@@ -20,13 +20,15 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, t_start/1, t_start_link/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, t_start/1, t_start_link/1,
 	 start_link_nodedown/1, errors/1]).
 
 %% Internal exports.
 -export([fun_init/1, test_errors/1]).
 -export([timeout_test/1, auth_test/1, rsh_test/1, start_a_slave/3]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [t_start_link, start_link_nodedown, t_start, errors].
 
diff --git a/lib/stdlib/test/sofs_SUITE.erl b/lib/stdlib/test/sofs_SUITE.erl
index fcf006da2b..e2aa5da6f5 100644
--- a/lib/stdlib/test/sofs_SUITE.erl
+++ b/lib/stdlib/test/sofs_SUITE.erl
@@ -30,7 +30,7 @@
 -define(format(S, A), ok).
 -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]).
 
 -export([ from_term_1/1, set_1/1, from_sets_1/1, relation_1/1,
 	 a_function_1/1, family_1/1, projection/1,
@@ -85,6 +85,8 @@
 
 -compile({inline,[{eval,2}]}).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, sofs}, {group, sofs_family}].
 
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index 16832a142b..6454cd7b6c 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -28,7 +28,7 @@
 -define(application, stdlib).
 
 % 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.
@@ -38,6 +38,8 @@
 %%
 %% all/1
 %%
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [[app_test]].
 
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 165eaf5f31..e7da22b5eb 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_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.
@@ -40,6 +40,8 @@
 %%
 %% all/1
 %%
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [len, equal, concat, chr_rchr, str_rstr, span_cspan,
  substr, tokens, chars, copies, words, strip, sub_word,
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index 321e21814a..35977b819e 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -23,7 +23,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% Testserver specific export
--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]).
 
 %% Indirect spawn export
 -export([init/1]).
@@ -54,6 +54,8 @@
 
 %-------------------------------------------------------------------------
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, sup_start}, {group, sup_stop}, child_adm,
  child_adm_simple, extra_return, child_specs,
diff --git a/lib/stdlib/test/supervisor_bridge_SUITE.erl b/lib/stdlib/test/supervisor_bridge_SUITE.erl
index a7aec23a3d..8bf3c846ed 100644
--- a/lib/stdlib/test/supervisor_bridge_SUITE.erl
+++ b/lib/stdlib/test/supervisor_bridge_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(supervisor_bridge_SUITE).
--export([all/0,groups/0,init_per_group/2,end_per_group/2,starting/1,mini_terminate/1,mini_die/1,badstart/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,starting/1,mini_terminate/1,mini_die/1,badstart/1]).
 -export([client/1,init/1,internal_loop_init/1,terminate/2]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -26,6 +26,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [starting, mini_terminate, mini_die, badstart].
 
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index 5d6d0a416c..48071ac24e 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(sys_SUITE).
--export([all/0,groups/0,init_per_group/2,end_per_group/2,log/1,log_to_file/1,stats/1,trace/1,suspend/1,install/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,log/1,log_to_file/1,stats/1,trace/1,suspend/1,install/1]).
 -export([handle_call/3,terminate/2,init/1]).
 -include_lib("test_server/include/test_server.hrl").
 
@@ -29,6 +29,8 @@
 %% system messages at all.
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [log, log_to_file, stats, trace, suspend, install].
 
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index b9f4f2cad8..138a209a7a 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(tar_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, borderline/1, atomic/1, long_names/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, borderline/1, atomic/1, long_names/1,
 	 create_long_names/1, bad_tar/1, errors/1, extract_from_binary/1,
 	 extract_from_binary_compressed/1,
 	 extract_from_open_file/1, symlinks/1, open_add_close/1, cooked_compressed/1,
@@ -27,6 +27,8 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [borderline, atomic, long_names, create_long_names,
  bad_tar, errors, extract_from_binary,
diff --git a/lib/stdlib/test/timer_SUITE.erl b/lib/stdlib/test/timer_SUITE.erl
index 87b1495a58..629d0489ed 100644
--- a/lib/stdlib/test/timer_SUITE.erl
+++ b/lib/stdlib/test/timer_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(timer_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([do_big_test/1]).
 -export([big_test/1, collect/3, i_t/3, a_t/2]).
 -export([do_nrev/1, internal_watchdog/2]).
@@ -51,6 +51,8 @@
 %% amount of load. The test suite should also include tests that test the
 %% interface of the timer module.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [do_big_test].
 
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl
index 8e209eab35..73e57b19d2 100644
--- a/lib/stdlib/test/timer_simple_SUITE.erl
+++ b/lib/stdlib/test/timer_simple_SUITE.erl
@@ -21,7 +21,7 @@
 -module(timer_simple_SUITE).
 
 %% external
--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,
 	 apply_after/1,
 	 send_after1/1,
@@ -54,6 +54,8 @@
 -define(MAXREF, (1 bsl 18)).
 -define(REFMARG, 30).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [apply_after, send_after1, send_after2, send_after3,
  exit_after1, exit_after2, kill_after1, kill_after2,
diff --git a/lib/stdlib/test/unicode_SUITE.erl b/lib/stdlib/test/unicode_SUITE.erl
index b5436696e9..6d6a89c81f 100644
--- a/lib/stdlib/test/unicode_SUITE.erl
+++ b/lib/stdlib/test/unicode_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,	 
 	 init_per_testcase/2,
 	 end_per_testcase/2,
 	 utf8_illegal_sequences_bif/1,
@@ -38,6 +38,8 @@ end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [utf8_illegal_sequences_bif,
  utf16_illegal_sequences_bif, random_lists, roundtrips,
diff --git a/lib/stdlib/test/win32reg_SUITE.erl b/lib/stdlib/test/win32reg_SUITE.erl
index 35c21861c1..583e1f96de 100644
--- a/lib/stdlib/test/win32reg_SUITE.erl
+++ b/lib/stdlib/test/win32reg_SUITE.erl
@@ -18,11 +18,13 @@
 %%
 -module(win32reg_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,long/1,evil_write/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,long/1,evil_write/1]).
 -export([ostype/1,fini/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [long, evil_write].
 
diff --git a/lib/stdlib/test/y2k_SUITE.erl b/lib/stdlib/test/y2k_SUITE.erl
index 670c131afb..20b6ca31bc 100644
--- a/lib/stdlib/test/y2k_SUITE.erl
+++ b/lib/stdlib/test/y2k_SUITE.erl
@@ -23,13 +23,15 @@
 
 -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,
 	 date_1999_01_01/1, date_1999_02_28/1, 
 	 date_1999_09_09/1, date_2000_01_01/1, 
 	 date_2000_02_29/1, date_2001_01_01/1, 
 	 date_2001_02_29/1, date_2004_02_29/1
 	]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [date_1999_01_01, date_1999_02_28, date_1999_09_09,
  date_2000_01_01, date_2000_02_29, date_2001_01_01,
diff --git a/lib/stdlib/test/zip_SUITE.erl b/lib/stdlib/test/zip_SUITE.erl
index 06228317ce..33d1bae1bc 100644
--- a/lib/stdlib/test/zip_SUITE.erl
+++ b/lib/stdlib/test/zip_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(zip_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, borderline/1, atomic/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, borderline/1, atomic/1,
          bad_zip/1, unzip_from_binary/1, unzip_to_binary/1,
          zip_to_binary/1,
          unzip_options/1, zip_options/1, list_dir_options/1, aliases/1,
@@ -31,6 +31,8 @@
 -include_lib("kernel/include/file.hrl").
 -include_lib("stdlib/include/zip.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [borderline, atomic, bad_zip, unzip_from_binary,
  unzip_to_binary, zip_to_binary, unzip_options,