Add ts_install_scb to suite/0

27 files changed, 81 insertions, 30 deletions

diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index 990ec13887..d9272b3f2e 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -18,12 +18,14 @@
 %%
 -module(andor_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,
 	 t_case/1,t_and_or/1,t_andalso/1,t_orelse/1,inside/1,overlap/1,
 	 combined/1,in_case/1,before_and_inside_if/1]).
 	 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(andor_SUITE),
 	[t_case, t_and_or, t_andalso, t_orelse, inside, overlap,
diff --git a/lib/compiler/test/apply_SUITE.erl b/lib/compiler/test/apply_SUITE.erl
index 7b34334fd1..cd55bcf96b 100644
--- a/lib/compiler/test/apply_SUITE.erl
+++ b/lib/compiler/test/apply_SUITE.erl
@@ -18,12 +18,14 @@
 %%
 -module(apply_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,mfa/1,fun_apply/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,mfa/1,fun_apply/1]).
 
 -export([foo/0,bar/1,baz/2]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(apply_SUITE),
 	[mfa, fun_apply].
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index 85053f71ed..7efee6f5ab 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(beam_validator_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,
 	 beam_files/1,compiler_bug/1,stupid_but_valid/1,
 	 xrange/1,yrange/1,stack/1,call_last/1,merge_undefined/1,
 	 uninit/1,unsafe_catch/1,
@@ -41,6 +41,8 @@ end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(beam_validator_SUITE),
 	[beam_files, compiler_bug, stupid_but_valid, xrange,
diff --git a/lib/compiler/test/bs_bincomp_SUITE.erl b/lib/compiler/test/bs_bincomp_SUITE.erl
index 4eb815ab59..5509e8f786 100644
--- a/lib/compiler/test/bs_bincomp_SUITE.erl
+++ b/lib/compiler/test/bs_bincomp_SUITE.erl
@@ -21,13 +21,15 @@
 
 -module(bs_bincomp_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,
 	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
 	 extended_bit_aligned/1,mixed/1,filters/1,trim_coverage/1,
 	 nomatch/1,sizes/1,tail/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     test_lib:recompile(bs_bincomp_SUITE),
     [byte_aligned, bit_aligned, extended_byte_aligned,
diff --git a/lib/compiler/test/bs_bit_binaries_SUITE.erl b/lib/compiler/test/bs_bit_binaries_SUITE.erl
index 6d3d26120e..ac738af59e 100644
--- a/lib/compiler/test/bs_bit_binaries_SUITE.erl
+++ b/lib/compiler/test/bs_bit_binaries_SUITE.erl
@@ -21,7 +21,7 @@
 
 -module(bs_bit_binaries_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,
 	 misc/1,horrid_match/1,test_bitstr/1,test_bit_size/1,asymmetric_tests/1,
 	 big_asymmetric_tests/1,binary_to_and_from_list/1,
 	 big_binary_to_and_from_list/1,send_and_receive/1,
@@ -29,6 +29,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(bs_bit_binaries_SUITE),
 	[misc, horrid_match, test_bitstr, test_bit_size,
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index 0a19a9e20c..ab87da5231 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -23,13 +23,15 @@
 
 -module(bs_construct_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,
 	 two/1,test1/1,fail/1,float_bin/1,in_guard/1,in_catch/1,
 	 nasty_literals/1,coerce_to_float/1,side_effect/1,
 	 opt/1,otp_7556/1,float_arith/1,otp_8054/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(bs_construct_SUITE),
 	[two, test1, fail, float_bin, in_guard, in_catch,
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index b1ec1c4d59..4b74ddc749 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -20,7 +20,7 @@
 -module(bs_match_SUITE).
 -compile(nowarn_shadow_vars).
 
--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,
 	 fun_shadow/1,int_float/1,otp_5269/1,null_fields/1,wiger/1,
 	 bin_tail/1,save_restore/1,shadowed_size_var/1,
 	 partitioned_bs_match/1,function_clause/1,
@@ -38,6 +38,8 @@
 -include_lib("test_server/include/test_server.hrl").
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(bs_match_SUITE),
 	[fun_shadow, int_float, otp_5269, null_fields, wiger,
diff --git a/lib/compiler/test/bs_utf_SUITE.erl b/lib/compiler/test/bs_utf_SUITE.erl
index fd1e3ab8d0..28a2ae6271 100644
--- a/lib/compiler/test/bs_utf_SUITE.erl
+++ b/lib/compiler/test/bs_utf_SUITE.erl
@@ -19,13 +19,15 @@
 
 -module(bs_utf_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,
 	 utf8_roundtrip/1,unused_utf_char/1,utf16_roundtrip/1,
 	 utf32_roundtrip/1,guard/1,extreme_tripping/1,
 	 literals/1,coverage/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(bs_utf_SUITE),
 	[utf8_roundtrip, unused_utf_char, utf16_roundtrip,
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index 364e8ceba8..d747cd459c 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -24,6 +24,8 @@
 
 -compile(export_all).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     test_lib:recompile(compilation_SUITE),
     [self_compile_old_inliner, self_compile, compiler_1,
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index b2842e937b..b6054615f0 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -22,7 +22,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,
 	 app_test/1,
 	 file_1/1, module_mismatch/1, big_file/1, outdir/1, 
 	 binary/1, cond_and_ifdef/1, listings/1, listings_big/1,
@@ -32,11 +32,11 @@
 
 -export([init/3]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 %% To cover the stripping of 'type' and 'spec' in beam_asm.
 -type all_return_type() :: [atom()].
 -spec all() -> all_return_type().
-
 all() -> 
 test_lib:recompile(compile_SUITE),
 	[app_test, file_1, module_mismatch, big_file, outdir,
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index 0c7cb907b4..9d17b0cb48 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(core_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,
 	 dehydrated_itracer/1,nested_tries/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -35,6 +35,8 @@ end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(core_SUITE),
 	[dehydrated_itracer, nested_tries].
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index cb2d46ef40..3d5798fe5a 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(core_fold_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,
 	 t_element/1,setelement/1,t_length/1,append/1,t_apply/1,bifs/1,
 	 eq/1,nested_call_in_case/1,coverage/1]).
 
@@ -26,6 +26,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(core_fold_SUITE),
 	[t_element, setelement, t_length, append, t_apply, bifs,
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index b6976c73b5..5360c5d700 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -20,9 +20,11 @@
 
 -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,
 	 head_mismatch_line/1,warnings_as_errors/1, bif_clashes/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(error_SUITE),
 	[head_mismatch_line, warnings_as_errors, bif_clashes].
diff --git a/lib/compiler/test/float_SUITE.erl b/lib/compiler/test/float_SUITE.erl
index 864458e4a8..5f0af29b87 100644
--- a/lib/compiler/test/float_SUITE.erl
+++ b/lib/compiler/test/float_SUITE.erl
@@ -17,10 +17,12 @@
 %% %CopyrightEnd%
 %%
 -module(float_SUITE).
--export([all/0,groups/0,init_per_group/2,end_per_group/2,pending/1,bif_calls/1,math_functions/1,mixed_float_and_int/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,pending/1,bif_calls/1,math_functions/1,mixed_float_and_int/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(float_SUITE),
 	[pending, bif_calls, math_functions,
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index ff04c043d4..7f8b91328d 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_SUITE.erl
@@ -18,11 +18,13 @@
 %%
 -module(fun_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,
 	 test1/1,overwritten_fun/1,otp_7202/1,bif_fun/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(fun_SUITE),
 	[test1, overwritten_fun, otp_7202, bif_fun].
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 1d8c0b0a3a..f01dc18ecc 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_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,
 	 misc/1,const_cond/1,basic_not/1,complex_not/1,nested_nots/1,
 	 semicolon/1,complex_semicolon/1,comma/1,
 	 or_guard/1,more_or_guards/1,
@@ -33,6 +33,8 @@
 	 basic_andalso_orelse/1,traverse_dcd/1,
 	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(guard_SUITE),
 	[misc, const_cond, basic_not, complex_not, nested_nots,
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index 35b7fa91a0..9d435fc39b 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -28,6 +28,8 @@
 %% Needed by test case `lists'.
 -compile(inline_list_funcs).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(inline_SUITE),
 	[attribute, bsdecode, bsdes, barnes2, decode1, smith,
diff --git a/lib/compiler/test/lc_SUITE.erl b/lib/compiler/test/lc_SUITE.erl
index 55ca2d0501..edb44ff8b6 100644
--- a/lib/compiler/test/lc_SUITE.erl
+++ b/lib/compiler/test/lc_SUITE.erl
@@ -19,12 +19,14 @@
 -module(lc_SUITE).
 
 -author('[email protected]').
--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,deeply_nested/1,no_generator/1,
 	 empty_generator/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(lc_SUITE),
 	[basic, deeply_nested, no_generator, empty_generator].
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index 9c9907d9b4..447c66db54 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -18,13 +18,15 @@
 %%
 -module(match_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,
 	 pmatch/1,mixed/1,aliases/1,match_in_call/1,
 	 untuplify/1,shortcut_boolean/1,letify_guard/1,
 	 selectify/1,underscore/1]).
 	 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(match_SUITE),
 	[pmatch, mixed, aliases, match_in_call, untuplify,
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 1054be0a5f..fa99e63574 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(misc_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,
 	 tobias/1,empty_string/1,md5/1,silly_coverage/1,
 	 confused_literals/1,integer_encoding/1,override_bif/1]).
 	 
@@ -50,12 +50,13 @@ end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
--spec all() -> misc_SUITE_test_cases().
+suite() -> [{suite_callbacks,[ts_install_scb]}].
 
+-spec all() -> misc_SUITE_test_cases().
 all() -> 
-test_lib:recompile(misc_SUITE),
-	[tobias, empty_string, md5, silly_coverage,
- confused_literals, integer_encoding, override_bif].
+    test_lib:recompile(misc_SUITE),
+    [tobias, empty_string, md5, silly_coverage,
+     confused_literals, integer_encoding, override_bif].
 
 groups() -> 
     [].
diff --git a/lib/compiler/test/num_bif_SUITE.erl b/lib/compiler/test/num_bif_SUITE.erl
index 6861077c7b..3291398f88 100644
--- a/lib/compiler/test/num_bif_SUITE.erl
+++ b/lib/compiler/test/num_bif_SUITE.erl
@@ -30,12 +30,14 @@
 %%	round/1
 %%	trunc/1
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, t_abs/1, t_float/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, t_abs/1, t_float/1,
 	 t_float_to_list/1, t_integer_to_list/1,
 	 t_list_to_integer/1,
 	 t_list_to_float_safe/1, t_list_to_float_risky/1,
 	 t_round/1, t_trunc/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(num_bif_SUITE),
 	[t_abs, t_float, t_float_to_list, t_integer_to_list,
diff --git a/lib/compiler/test/parteval_SUITE.erl b/lib/compiler/test/parteval_SUITE.erl
index 087e7c087a..ebfb542ccb 100644
--- a/lib/compiler/test/parteval_SUITE.erl
+++ b/lib/compiler/test/parteval_SUITE.erl
@@ -20,7 +20,9 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, pe2/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, pe2/1]).
+
+suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
 [pe2].
diff --git a/lib/compiler/test/pmod_SUITE.erl b/lib/compiler/test/pmod_SUITE.erl
index 37cf6ef0ba..372b640349 100644
--- a/lib/compiler/test/pmod_SUITE.erl
+++ b/lib/compiler/test/pmod_SUITE.erl
@@ -18,11 +18,13 @@
 %%
 -module(pmod_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, otp_8447/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(pmod_SUITE),
 	[basic, otp_8447].
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index 2cae5aeac0..8a02025336 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -20,7 +20,7 @@
 
 -module(receive_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,
 	 recv/1,coverage/1,otp_7980/1,ref_opt/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -34,6 +34,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     test_lib:recompile(receive_SUITE),
     [recv, coverage, otp_7980, ref_opt, export].
diff --git a/lib/compiler/test/record_SUITE.erl b/lib/compiler/test/record_SUITE.erl
index ee7dfda398..17d8b50d42 100644
--- a/lib/compiler/test/record_SUITE.erl
+++ b/lib/compiler/test/record_SUITE.erl
@@ -22,7 +22,7 @@
 
 -include_lib("test_server/include/test_server.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,
 	 errors/1,record_test_2/1,record_test_3/1,record_access_in_guards/1,
 	 guard_opt/1,eval_once/1,foobar/1,missing_test_heap/1, nested_access/1]).
 
@@ -35,6 +35,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(record_SUITE),
 	[errors, record_test_2, record_test_3,
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index 6729b340c3..a844cca3b4 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(trycatch_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,basic/1,lean_throw/1,try_of/1,try_after/1,%after_bind/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,basic/1,lean_throw/1,try_of/1,try_after/1,%after_bind/1,
 	 catch_oops/1,after_oops/1,eclectic/1,rethrow/1,
 	 nested_of/1,nested_catch/1,nested_after/1,
 	 nested_horrid/1,last_call_optimization/1,bool/1,
@@ -26,6 +26,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(trycatch_SUITE),
 	[basic, lean_throw, try_of, try_after, catch_oops,
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index 0cc395cf51..e0b1c84ad0 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -31,7 +31,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([pattern/1,pattern2/1,pattern3/1,pattern4/1,
 	 guard/1,bad_arith/1,bool_cases/1,bad_apply/1,
@@ -49,6 +49,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 test_lib:recompile(warnings_SUITE),
 	[pattern, pattern2, pattern3, pattern4, guard,