3 files changed, 22 insertions, 6 deletions
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 571958ca03..4188bd7c3b 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -309,7 +309,12 @@ is_started(ENode) ->
 
 % make a Erlang node name from name and hostname
 enodename(Host, Node) ->
-    list_to_atom(atom_to_list(Node)++"@"++atom_to_list(Host)).
+    case lists:member($@, atom_to_list(Node)) of
+        true ->
+            Node;
+        false ->
+            list_to_atom(atom_to_list(Node)++"@"++atom_to_list(Host))
+    end.
 
 % performs actual start of the "slave" node
 do_start(Host, Node, Options) ->
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index be49191f2e..0256206e59 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -359,10 +359,10 @@ stick_all_sticky(Node,Sticky) ->
 %% cover.
 
 run_test_case_apply({Mod,Func,Args,Name,RunInit,TimetrapData}) ->
-    case os:getenv("TS_RUN_VALGRIND") of
+    case is_valgrind() of
 	false ->
 	    ok;
-	_ ->
+	true ->
 	    os:putenv("VALGRIND_LOGFILE_INFIX",atom_to_list(Mod)++"."++
 		      atom_to_list(Func)++"-")
     end,
@@ -1827,7 +1827,8 @@ timetrap_scale_factor() ->
 	{ 2, fun() -> has_lock_checking() end},
 	{ 3, fun() -> has_superfluous_schedulers() end},
 	{ 6, fun() -> is_debug() end},
-	{10, fun() -> is_cover() end}
+	{10, fun() -> is_cover() end},
+        {10, fun() -> is_valgrind() end}
     ]).
 
 timetrap_scale_factor(Scales) ->
@@ -2729,6 +2730,16 @@ is_commercial() ->
 	_ -> true
     end.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% is_valgrind() -> boolean()
+%%
+%% Returns true if valgrind is running, else false
+is_valgrind() ->
+    case os:getenv("TS_RUN_VALGRIND") of
+	false -> false;
+	_ -> true
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% Apply given function and reply to caller or proxy.
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index 0b406c54cc..92c610730e 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -18,11 +18,11 @@
 %% %CopyrightEnd%
 %%
 -module(test_server_node).
--compile(r12).
+-compile(r16).
 
 %%%
 %%% The same compiled code for this module must be possible to load
-%%% in R12B and later.
+%%% in R16B and later.
 %%%
 
 %% Test Controller interface