4 files changed, 12 insertions, 4 deletions
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 4e23061b44..73684eb246 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -20,7 +20,7 @@
 -module(crashdump_viewer_SUITE).
 
 %% Test functions
--export([all/0,groups/0,init_per_group/2,end_per_group/2,translate/1,start/1,fini/1,load_file/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,translate/1,start/1,fini/1,load_file/1,
 	 non_existing/1,not_a_crashdump/1,old_crashdump/1]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -46,6 +46,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [translate, load_file, non_existing, not_a_crashdump,
  old_crashdump].
diff --git a/lib/observer/test/etop_SUITE.erl b/lib/observer/test/etop_SUITE.erl
index bacc390a77..07180e9f78 100644
--- a/lib/observer/test/etop_SUITE.erl
+++ b/lib/observer/test/etop_SUITE.erl
@@ -20,7 +20,7 @@
 -module(etop_SUITE).
 
 %% Test functions
--export([all/0,groups/0,init_per_group/2,end_per_group/2,text/1,text_tracing_off/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,text/1,text_tracing_off/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -35,6 +35,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [text, text_tracing_off].
 
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 626a0125db..d3d4f4bdf0 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -21,7 +21,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
@@ -39,6 +39,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [app_file].
 
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index 9ac3714603..0eff966e31 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -21,7 +21,7 @@
 
 -compile(export_all).
 %% Test functions
--export([all/0,groups/0,init_per_group/2,end_per_group/2,file/1,file_no_pi/1,file_fetch/1,wrap/1,wrap_merge/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,file/1,file_no_pi/1,file_fetch/1,wrap/1,wrap_merge/1,
 	 wrap_merge_fetch_format/1,write_config1/1,write_config2/1,
 	 write_config3/1,history/1,write_trace_info/1,seq_trace/1,
 	 diskless/1,otp_4967_1/1,otp_4967_2/1]).
@@ -41,6 +41,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [file, file_no_pi, file_fetch, wrap, wrap_merge,
  wrap_merge_fetch_format, write_config1, write_config2,