1 files changed, 8 insertions, 30 deletions
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index 91fb79bc80..d90daf78c3 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -27,54 +27,32 @@
 %%%-------------------------------------------------------------------
 -module(erlexec_SUITE).
 
+-export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 
-%-define(line_trace, 1).
-
--define(DEFAULT_TIMEOUT, ?t:minutes(1)).
-
--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]).
-
--export([args_file/1, evil_args_file/1, env/1, args_file_env/1, otp_7461/1, otp_7461_remote/1, otp_8209/1, zdbbl_dist_buf_busy_limit/1]).
+-export([args_file/1, evil_args_file/1, env/1, args_file_env/1,
+         otp_7461/1, otp_7461_remote/1, otp_8209/1,
+         zdbbl_dist_buf_busy_limit/1]).
 
 -include_lib("common_test/include/ct.hrl").
-    
 
 init_per_testcase(Case, Config) ->
-    Dog = ?t:timetrap(?DEFAULT_TIMEOUT),
     SavedEnv = save_env(),
-    [{testcase, Case}, {watchdog, Dog}, {erl_flags_env, SavedEnv} |Config].
+    [{testcase, Case},{erl_flags_env, SavedEnv}|Config].
 
 end_per_testcase(_Case, Config) ->
-    Dog = ?config(watchdog, Config),
     SavedEnv = ?config(erl_flags_env, Config),
     restore_env(SavedEnv),
     cleanup_nodes(),
-    ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
 
 all() -> 
     [args_file, evil_args_file, env, args_file_env,
      otp_7461, otp_8209, zdbbl_dist_buf_busy_limit].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 otp_8209(doc) ->
     ["Test that plain first argument does not "
      "destroy -home switch [OTP-8209]"];