4 files changed, 11 insertions, 3 deletions
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index f8821712b4..65512bbe0e 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -19,7 +19,7 @@
 -module(dbg_SUITE).
 
 %% Test functions
--export([all/0,groups/0,init_per_group/2,end_per_group/2, big/1, tiny/1, simple/1, message/1, distributed/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, big/1, tiny/1, simple/1, message/1, distributed/1,
 	 ip_port/1, file_port/1, file_port2/1, file_port_schedfix/1,
 	 ip_port_busy/1, wrap_port/1, wrap_port_time/1,
 	 with_seq_trace/1, dead_suspend/1, local_trace/1,
@@ -39,6 +39,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [big, tiny, simple, message, distributed, ip_port,
  file_port, file_port2, file_port_schedfix, ip_port_busy,
diff --git a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
index 13177ddcec..c3e4d24a61 100644
--- a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
+++ b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
@@ -24,7 +24,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %-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]).
 
 %% Testcases
 -export([basic/1]).
@@ -34,6 +34,8 @@
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(2)).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [basic].
 
diff --git a/lib/runtime_tools/test/inviso_SUITE.erl b/lib/runtime_tools/test/inviso_SUITE.erl
index c5291a7904..b07a70afa8 100644
--- a/lib/runtime_tools/test/inviso_SUITE.erl
+++ b/lib/runtime_tools/test/inviso_SUITE.erl
@@ -34,6 +34,8 @@
 
 -define(l,?line).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [basic_dist_trace_1, basic_dist_trace_2,
  basic_dist_trace_3, basic_dist_trace_ti_1,
diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl
index 61afd37ef0..5fcf26cee0 100644
--- a/lib/runtime_tools/test/runtime_tools_SUITE.erl
+++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl
@@ -20,7 +20,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% 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
@@ -38,6 +38,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [app_file].