3 files changed, 8 insertions, 9 deletions
diff --git a/lib/runtime_tools/test/dyntrace_SUITE.erl b/lib/runtime_tools/test/dyntrace_SUITE.erl
index 5e84f8a3b5..7be2f49a8b 100644
--- a/lib/runtime_tools/test/dyntrace_SUITE.erl
+++ b/lib/runtime_tools/test/dyntrace_SUITE.erl
@@ -62,7 +62,7 @@ end_per_suite(_Config) ->
     ok.
 
 smoke(Config) ->
-    Emu = ?t:lookup_config(emu_name, Config),
+    Emu = test_server:lookup_config(emu_name, Config),
     BinEmu = list_to_binary(Emu),
     case erlang:system_info(dynamic_trace) of
 	dtrace ->
@@ -89,8 +89,7 @@ process(_Config) ->
 	      {probe,"process-hibernate"},
 	      {action,[{printf,["hibernate %s %s\n",{arg,0},{arg,1}]}]},
 	      {probe,"process-exit"},
-	      {action,[{printf,["exit %s %s\n",{arg,0},{arg,1}]}]}
-	     ],
+	      {action,[{printf,["exit %s %s\n",{arg,0},{arg,1}]}]}],
     F = fun() ->
 		{Pid,Ref} = spawn_monitor(fun my_process/0),
 		Pid ! hibernate,
diff --git a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
index 9fbff50da5..d36c58e749 100644
--- a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
+++ b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
@@ -161,12 +161,12 @@ start_node(Config) ->
 
 start_node(Config, Args) ->
     Pa = filename:dirname(code:which(?MODULE)),
-    ?t:start_node(mk_name(Config),
-                  slave,
-                  [{args, "-pa " ++ Pa ++ " " ++ Args}]).
+    test_server:start_node(mk_name(Config),
+                           slave,
+                           [{args, "-pa " ++ Pa ++ " " ++ Args}]).
 
 stop_node(Node) ->
-    true = ?t:stop_node(Node).
+    true = test_server:stop_node(Node).
 
 privfile(Name, Config) ->
     filename:join([proplists:get_value(priv_dir, Config),
diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl
index e1e7b85871..6877e1a379 100644
--- a/lib/runtime_tools/test/runtime_tools_SUITE.erl
+++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl
@@ -37,11 +37,11 @@ all() ->
 
 
 app_file(_Config) ->
-    ok = ?t:app_test(runtime_tools),
+    ok = test_server:app_test(runtime_tools),
     ok.
 
 appup_file(_Config) ->
-    ok = ?t:appup_test(runtime_tools).
+    ok = test_server:appup_test(runtime_tools).
 
 start_stop_app(_Config) ->
     ok = application:start(runtime_tools),