4 files changed, 6 insertions, 6 deletions
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index d1c2113ba4..72ceb87bf1 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -462,7 +462,7 @@ self_compile_node(CompilerDir, OutDir, Version, Opts) ->
     %% because it will load the same cover-compiled code as on this
     %% node. Use a shielded node to prevent the cover server from
     %% being started.
-    ?t:run_on_shielded_node(
+    test_server:run_on_shielded_node(
        fun() ->
 	       compile_compiler(Files, OutDir, Version, Opts)
        end, Pa),
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index f3217b8c39..4eb42f81cc 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -71,11 +71,11 @@ end_per_group(_GroupName, Config) ->
 
 %% Test that the Application file has no `basic' errors.";
 app_test(Config) when is_list(Config) ->
-    ?line ?t:app_test(compiler).
+    test_server:app_test(compiler).
 
 %% Test that the Application upgrade file has no `basic' errors.";
 appup_test(Config) when is_list(Config) ->
-    ok = ?t:appup_test(compiler).
+    ok = test_server:appup_test(compiler).
 
 %% Tests that we can compile and run a simple Erlang program,
 %% using compile:file/1.
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index cb552e16e3..004a51f7dd 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -48,7 +48,7 @@ init_per_suite(Config) ->
 
 end_per_suite(Config) ->
     Node = proplists:get_value(testing_node, Config),
-    ?t:stop_node(Node),
+    test_server:stop_node(Node),
     ok.
 
 init_per_group(_GroupName, Config) ->
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index beb03859c7..6a0237373a 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -52,7 +52,7 @@ smoke_disasm(File) when is_list(File) ->
 %% be slower than running them sequentially.
 
 parallel() ->
-    case ?t:is_cover() orelse erlang:system_info(schedulers) =:= 1 of
+    case test_server:is_cover() orelse erlang:system_info(schedulers) =:= 1 of
 	true -> [];
 	false -> [parallel]
     end.
@@ -96,7 +96,7 @@ get_data_dir(Config) ->
 
 p_run(Test, List) ->
     S = erlang:system_info(schedulers),
-    N = case ?t:is_cover() of
+    N = case test_server:is_cover() of
 	    false ->
 		S + 1;
 	    true ->