Merge branch 'siri/unicode-atoms/OTP-14285'

* siri/unicode-atoms/OTP-14285:
  [sasl] Improve handling of unicode in rb
  [ttb] Handle unicode atoms in trace data and config files
  [dbg] Update default trace handler to print unicode atoms correctly
  [etop] Fix handling of unicode atoms
  [stdlib] Open sys debug logs as utf8
  [stdlib] Open error log file as utf8
  [sasl] Improve handling of unicode atoms
  [ct] Print unicode atoms and strings correctly in common_test logs

49 files changed, 765 insertions, 441 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 7716afe0bd..19b0ee20fe 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -917,13 +917,13 @@ comment(Comment) when is_list(Comment) ->
     Formatted =
 	case (catch io_lib:format("~ts",[Comment])) of
 	    {'EXIT',_} ->  % it's a list not a string
-		io_lib:format("~p",[Comment]);
+		io_lib:format("~tp",[Comment]);
 	    String ->
 		String
 	end,
     send_html_comment(lists:flatten(Formatted));
 comment(Comment) ->
-    Formatted = io_lib:format("~p",[Comment]),
+    Formatted = io_lib:format("~tp",[Comment]),
     send_html_comment(lists:flatten(Formatted)).
 
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 99de311570..d3bfaa1d96 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -171,8 +171,8 @@ reload_config(KeyOrName) ->
 
 process_default_configs(Opts) ->
     lists:flatmap(fun({config,[_|_] = FileOrFiles}) ->
-			  case {io_lib:printable_list(FileOrFiles),
-				io_lib:printable_list(hd(FileOrFiles))} of
+			  case {io_lib:printable_unicode_list(FileOrFiles),
+				io_lib:printable_unicode_list(hd(FileOrFiles))} of
 			      {false,true} ->
 				  FileOrFiles;
 			      {true,false} ->
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index f6f383522d..cf0a228e1b 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -186,7 +186,7 @@ format_head(ConnMod,_,Time,Text) ->
     io_lib:format("~n~ts",[Head]).
 
 format_title(raw,#conn_log{client=Client}=Info) ->
-    io_lib:format("Client ~w ~s ~ts",[Client,actionstr(Info),serverstr(Info)]);
+    io_lib:format("Client ~tw ~s ~ts",[Client,actionstr(Info),serverstr(Info)]);
 format_title(_,Info) ->
     Title = pad_char_end(?WIDTH,pretty_title(Info),$=),
     io_lib:format("~n~ts", [Title]).
@@ -197,9 +197,9 @@ format_data(ConnMod,LogType,Data) ->
     ConnMod:format_data(LogType,Data).
 
 format_error(raw,Report) ->
-    io_lib:format("~n~p~n",[Report]);
+    io_lib:format("~n~tp~n",[Report]);
 format_error(pretty,Report) ->
-    [io_lib:format("~n    ~p: ~p",[K,V]) || {K,V} <- Report].
+    [io_lib:format("~n    ~tp: ~tp",[K,V]) || {K,V} <- Report].
 
 
 %%%-----------------------------------------------------------------
@@ -230,7 +230,7 @@ pretty_head({{{Y,Mo,D},{H,Mi,S}},MicroS},ConnMod,Text0) ->
 		   micro2milli(MicroS)]).
 
 pretty_title(#conn_log{client=Client}=Info) ->
-    io_lib:format("= Client ~w ~s ~ts ",
+    io_lib:format("= Client ~tw ~s ~ts ",
 		  [Client,actionstr(Info),serverstr(Info)]).
 
 actionstr(#conn_log{action=send}) -> "----->";
@@ -245,11 +245,11 @@ actionstr(_) -> "<---->".
 serverstr(#conn_log{name=undefined,address={undefined,_}}) ->
     io_lib:format("server",[]);
 serverstr(#conn_log{name=undefined,address=Address}) ->
-    io_lib:format("~p",[Address]);
+    io_lib:format("~tp",[Address]);
 serverstr(#conn_log{name=Alias,address={undefined,_}}) ->
-    io_lib:format("~w",[Alias]);
+    io_lib:format("~tw",[Alias]);
 serverstr(#conn_log{name=Alias,address=Address}) ->
-    io_lib:format("~w(~p)",[Alias,Address]).
+    io_lib:format("~tw(~tp)",[Alias,Address]).
 
 month(1) -> "Jan";
 month(2) -> "Feb";
diff --git a/lib/common_test/src/ct_event.erl b/lib/common_test/src/ct_event.erl
index 5fa9f410bf..197ea3c2b2 100644
--- a/lib/common_test/src/ct_event.erl
+++ b/lib/common_test/src/ct_event.erl
@@ -151,7 +151,7 @@ init(RecvPids) ->
 %%--------------------------------------------------------------------
 handle_event(Event,State=#state{receivers=RecvPids}) ->
     print("~n=== ~w ===~n", [?MODULE]),
-    print("~w: ~w~n", [Event#event.name,Event#event.data]),
+    print("~tw: ~tw~n", [Event#event.name,Event#event.data]),
     lists:foreach(fun(Recv) -> report_event(Recv,Event) end, RecvPids),
     {ok,State}.
 
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 141c7f5b0a..6066470233 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -312,7 +312,7 @@ add_defaults(Mod,Func, GroupPath) ->
 	    end;
 	{'EXIT',Reason} ->
 	    ErrStr = io_lib:format("~n*** ERROR *** "
-				   "~w:suite/0 failed: ~p~n",
+				   "~w:suite/0 failed: ~tp~n",
 				   [Suite,Reason]),
 	    io:format(ErrStr, []),
 	    io:format(?def_gl, ErrStr, []),
@@ -335,7 +335,7 @@ add_defaults(Mod,Func, GroupPath) ->
 		false ->
 		    ErrStr = io_lib:format("~n*** ERROR *** "
 					   "Invalid return value from "
-					   "~w:suite/0: ~p~n",
+					   "~w:suite/0: ~tp~n",
 					   [Suite,SuiteInfo]),
 		    io:format(ErrStr, []),
 		    io:format(?def_gl, ErrStr, []),
@@ -344,7 +344,7 @@ add_defaults(Mod,Func, GroupPath) ->
 	SuiteInfo ->
 	    ErrStr = io_lib:format("~n*** ERROR *** "
 				   "Invalid return value from "
-				   "~w:suite/0: ~p~n", [Suite,SuiteInfo]),
+				   "~w:suite/0: ~tp~n", [Suite,SuiteInfo]),
 	    io:format(ErrStr, []),
 	    io:format(?def_gl, ErrStr, []),
 	    {suite0_failed,bad_return_value}
@@ -371,7 +371,7 @@ add_defaults1(Mod,Func, GroupPath, SuiteInfo) ->
 	{value,{error,BadGr0Val,GrName}} ->
 	    Gr0ErrStr = io_lib:format("~n*** ERROR *** "
 				      "Invalid return value from "
-				      "~w:group(~w): ~p~n",
+				      "~w:group(~tw): ~tp~n",
 				      [Mod,GrName,BadGr0Val]),
 	    io:format(Gr0ErrStr, []),
 	    io:format(?def_gl, Gr0ErrStr, []),
@@ -393,7 +393,7 @@ add_defaults1(Mod,Func, GroupPath, SuiteInfo) ->
 		{error,BadTC0Val} ->
 		    TC0ErrStr = io_lib:format("~n*** ERROR *** "
 					      "Invalid return value from "
-					      "~w:~w/0: ~p~n",
+					      "~w:~tw/0: ~tp~n",
 					      [Mod,Func,BadTC0Val]),
 		    io:format(TC0ErrStr, []),
 		    io:format(?def_gl, TC0ErrStr, []),
@@ -921,7 +921,7 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 	      end,
     ErrorStr = case ErrorSpec of
 		 {badmatch,Descr} ->
-		     Descr1 = lists:flatten(io_lib:format("~P",[Descr,10])),
+		     Descr1 = lists:flatten(io_lib:format("~tP",[Descr,10])),
 		     if length(Descr1) > 50 ->
 			     Descr2 = string:substr(Descr1,1,50),
 			     io_lib:format("{badmatch,~ts...}",[Descr2]);
@@ -931,15 +931,15 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 		 {test_case_failed,Reason} ->
 		     case (catch io_lib:format("{test_case_failed,~ts}", [Reason])) of
 			 {'EXIT',_} ->
-			     io_lib:format("{test_case_failed,~p}", [Reason]);
+			     io_lib:format("{test_case_failed,~tp}", [Reason]);
 			 Result -> Result
 		     end;
 		 {'EXIT',_Reason} = EXIT ->
-		     io_lib:format("~P", [EXIT,5]);
+		     io_lib:format("~tP", [EXIT,5]);
 		 {Spec,_Reason} when is_atom(Spec) ->
-		     io_lib:format("~w", [Spec]);
+		     io_lib:format("~tw", [Spec]);
 		 Other ->
-		     io_lib:format("~P", [Other,5])
+		     io_lib:format("~tP", [Other,5])
 	     end,
     ErrorHtml =
 	"<font color=\"brown\">" ++ ct_logs:escape_chars(ErrorStr) ++ "</font>",
@@ -996,16 +996,16 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 	%% if a function specified by all/0 does not exist, we
 	%% pick up undef here
 	[{LastMod,LastFunc}|_] when ErrorStr == "undef" ->
-	    PrintError("~w:~w could not be executed~nReason: ~ts",
+	    PrintError("~w:~tw could not be executed~nReason: ~ts",
 		     [LastMod,LastFunc,ErrorStr]);
 
 	[{LastMod,LastFunc}|_] ->
-	    PrintError("~w:~w failed~nReason: ~ts", [LastMod,LastFunc,ErrorStr]);
+	    PrintError("~w:~tw failed~nReason: ~ts", [LastMod,LastFunc,ErrorStr]);
 	    
 	[{LastMod,LastFunc,LastLine}|_] ->
 	    %% print error to console, we are only
 	    %% interested in the last executed expression
-	    PrintError("~w:~w failed on line ~w~nReason: ~ts",
+	    PrintError("~w:~tw failed on line ~w~nReason: ~ts",
 		     [LastMod,LastFunc,LastLine,ErrorStr]),
 	    
 	    case ct_util:read_suite_data({seq,Mod,Func}) of
@@ -1178,7 +1178,7 @@ get_all(Mod, ConfTests) ->
 	    case ct_util:get_testdata({error_in_suite,Mod}) of
 		undefined ->
 		    ErrStr = io_lib:format("~n*** ERROR *** "
-					   "~w:all/0 failed: ~p~n",
+					   "~w:all/0 failed: ~tp~n",
 					   [Mod,ExitReason]),
 		    io:format(?def_gl, ErrStr, []),
 		    %% save the error info so it doesn't get printed twice
@@ -1294,8 +1294,8 @@ save_seq(Mod,Seq,SeqTCs,All) ->
 check_private(Seq,TCs,All) ->    
     Bad = lists:filter(fun(TC) -> lists:member(TC,All) end, TCs),
     if Bad /= [] ->
-	    Reason = io_lib:format("regular test cases not allowed in sequence ~p: "
-				   "~p",[Seq,Bad]),
+	    Reason = io_lib:format("regular test cases not allowed in sequence ~tp: "
+				   "~tp",[Seq,Bad]),
 	    throw({error,list_to_atom(lists:flatten(Reason))});
        true ->
 	    ok
@@ -1312,7 +1312,7 @@ check_multiple(Mod,Seq,TCs) ->
 		       end,TCs),
     if Bad /= [] ->
 	    Reason = io_lib:format("test cases found in multiple sequences: "
-				   "~p",[Bad]),
+				   "~tp",[Bad]),
 	    throw({error,list_to_atom(lists:flatten(Reason))});
        true ->
 	    ok
@@ -1340,15 +1340,15 @@ end_per_suite(_Config) ->
 %% if the group config functions are missing in the suite,
 %% use these instead
 init_per_group(GroupName, Config) ->
-    ct:comment(io_lib:format("start of ~p", [GroupName])),
-    ct_logs:log("TEST INFO", "init_per_group/2 for ~w missing "
+    ct:comment(io_lib:format("start of ~tp", [GroupName])),
+    ct_logs:log("TEST INFO", "init_per_group/2 for ~tw missing "
 		"in suite, using default.",
 		[GroupName]),
     Config.
 
 end_per_group(GroupName, _) ->
-    ct:comment(io_lib:format("end of ~p", [GroupName])),
-    ct_logs:log("TEST INFO", "end_per_group/2 for ~w missing "
+    ct:comment(io_lib:format("end of ~tp", [GroupName])),
+    ct_logs:log("TEST INFO", "end_per_group/2 for ~tw missing "
 		"in suite, using default.",
 		[GroupName]),
     ok.
diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl
index 84e664b387..c88b12e03b 100644
--- a/lib/common_test/src/ct_ftp.erl
+++ b/lib/common_test/src/ct_ftp.erl
@@ -119,19 +119,19 @@ open(KeyOrName) ->
 	_ ->
 	    case ct:get_config(KeyOrName) of
 		undefined ->
-		    log(heading(open,KeyOrName),"Failed: ~p\n",
+		    log(heading(open,KeyOrName),"Failed: ~tp\n",
 			[{not_available,KeyOrName}]),
 		    {error,{not_available,KeyOrName}};
 		_ ->
 		    case ct:get_config({KeyOrName,username}) of
 			undefined ->
-			    log(heading(open,KeyOrName),"Failed: ~p\n",
+			    log(heading(open,KeyOrName),"Failed: ~tp\n",
 				[{not_available,{KeyOrName,username}}]),
 			    {error,{not_available,{KeyOrName,username}}};
 			Username ->
 			    case ct:get_config({KeyOrName,password}) of
 				undefined ->
-				    log(heading(open,KeyOrName),"Failed: ~p\n",
+				    log(heading(open,KeyOrName),"Failed: ~tp\n",
 					[{not_available,{KeyOrName,password}}]),
 				    {error,{not_available,{KeyOrName,password}}};
 				Password ->
@@ -145,7 +145,7 @@ open(KeyOrName,Username,Password) ->
     log(heading(open,KeyOrName),"",[]),
     case ct:get_config({KeyOrName,ftp}) of
 	undefined ->
-	    log(heading(open,KeyOrName),"Failed: ~p\n",
+	    log(heading(open,KeyOrName),"Failed: ~tp\n",
 		[{not_available,{KeyOrName,ftp}}]),
 	    {error,{not_available,{KeyOrName,ftp}}};
 	Addr ->
@@ -284,7 +284,7 @@ init(KeyOrName,{IP,Port},{Username,Password}) ->
     case ftp_connect(IP,Port,Username,Password) of
 	{ok,FtpPid} ->
 	    log(heading(init,KeyOrName), 
-		"Opened ftp connection:\nIP: ~p\nUsername: ~p\nPassword: ~p\n",
+		"Opened ftp connection:\nIP: ~tp\nUsername: ~tp\nPassword: ~p\n",
 		[IP,Username,lists:duplicate(length(Password),$*)]),
 	    {ok,FtpPid,#state{ftp_pid=FtpPid,target_name=KeyOrName}};
 	Error ->
@@ -308,28 +308,28 @@ ftp_connect(IP,Port,Username,Password) ->
 %% @hidden
 handle_msg({send,LocalFile,RemoteFile},State) ->
     log(heading(send,State#state.target_name),
-	"LocalFile: ~p\nRemoteFile: ~p\n",[LocalFile,RemoteFile]),
+	"LocalFile: ~tp\nRemoteFile: ~tp\n",[LocalFile,RemoteFile]),
     Result = ftp:send(State#state.ftp_pid,LocalFile,RemoteFile),
     {Result,State};
 handle_msg({recv,RemoteFile,LocalFile},State) ->
     log(heading(recv,State#state.target_name),
-	"RemoteFile: ~p\nLocalFile: ~p\n",[RemoteFile,LocalFile]),
+	"RemoteFile: ~tp\nLocalFile: ~tp\n",[RemoteFile,LocalFile]),
     Result = ftp:recv(State#state.ftp_pid,RemoteFile,LocalFile),
     {Result,State};
 handle_msg({cd,Dir},State) ->
-    log(heading(cd,State#state.target_name),"Dir: ~p\n",[Dir]),
+    log(heading(cd,State#state.target_name),"Dir: ~tp\n",[Dir]),
     Result = ftp:cd(State#state.ftp_pid,Dir),
     {Result,State};
 handle_msg({ls,Dir},State) ->
-    log(heading(ls,State#state.target_name),"Dir: ~p\n",[Dir]),
+    log(heading(ls,State#state.target_name),"Dir: ~tp\n",[Dir]),
     Result = ftp:ls(State#state.ftp_pid,Dir),
     {Result,State};
 handle_msg({type,Type},State) ->
-    log(heading(type,State#state.target_name),"Type: ~p\n",[Type]),
+    log(heading(type,State#state.target_name),"Type: ~tp\n",[Type]),
     Result = ftp:type(State#state.ftp_pid,Type),
     {Result,State};
 handle_msg({delete,File},State) ->
-    log(heading(delete,State#state.target_name),"Delete file: ~p\n",[File]),
+    log(heading(delete,State#state.target_name),"Delete file: ~tp\n",[File]),
     Result = ftp:delete(State#state.ftp_pid,File),
     {Result,State}.
 
@@ -368,7 +368,7 @@ call(Pid,Msg) ->
 
 
 heading(Function,Name) ->
-    io_lib:format("ct_ftp:~w ~p",[Function,Name]).
+    io_lib:format("ct_ftp:~tw ~tp",[Function,Name]).
 
 log(Heading,Str,Args) ->
     ct_gen_conn:log(Heading,Str,Args).
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl
index 47324c7f7c..badb7c52ae 100644
--- a/lib/common_test/src/ct_gen_conn.erl
+++ b/lib/common_test/src/ct_gen_conn.erl
@@ -247,7 +247,7 @@ do_start(Opts) ->
 	    Error;
 	{'DOWN',MRef,process,_,Reason} ->
 	    log("ct_gen_conn:start",
-		"Connection process died: ~p\n",
+		"Connection process died: ~tp\n",
 		[Reason]),
 	    {error,{connection_process_died,Reason}}
     end.
@@ -327,7 +327,7 @@ loop(Opts) ->
 	    case Opts#gen_opts.reconnect of
 		true ->
 		    log("Connection down!\nOpening new!",
-			"Reason: ~p\nAddress: ~p\n",
+			"Reason: ~tp\nAddress: ~tp\n",
 			[Reason,Opts#gen_opts.address]),
 		    case reconnect(Opts) of
 			{ok, NewPid, NewState} ->
@@ -338,12 +338,12 @@ loop(Opts) ->
 			Error ->
 			    ct_util:unregister_connection(self()),
 			    log("Reconnect failed. Giving up!",
-				"Reason: ~p\n",
+				"Reason: ~tp\n",
 				[Error])
 		    end;
 		false ->
 		    ct_util:unregister_connection(self()),
-		    log("Connection closed!","Reason: ~p\n",[Reason])
+		    log("Connection closed!","Reason: ~tp\n",[Reason])
 	    end;
 	{'EXIT',Pid,Reason} ->
 	    case Opts#gen_opts.ct_util_server of
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index 333151ee1b..2235365a0e 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -210,7 +210,7 @@ find(Mod, _GrNames, _TCs, [BadTerm | _Gs], Known, _Defs, _FindAll) ->
 		    "group "++atom_to_list(lists:last(Known))++
 			" in "++atom_to_list(Mod)++":groups/0"
 	    end,		 
-    Term = io_lib:format("~p", [BadTerm]),
+    Term = io_lib:format("~tp", [BadTerm]),
     E = "Bad term "++lists:flatten(Term)++" in "++Where,
     throw({error,list_to_atom(E)});
 
@@ -447,7 +447,7 @@ make_conf(Mod, Name, Props, TestSpec) ->
 	    {false,false} ->
 		ct_logs:log("TEST INFO", "init_per_group/2 and "
 			    "end_per_group/2 missing for group "
-			    "~w in ~w, using default.",
+			    "~tw in ~w, using default.",
 			    [Name,Mod]),
 		{{ct_framework,init_per_group},
 		 {ct_framework,end_per_group},
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index 8cdc6d8c75..f0592a40be 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -235,7 +235,7 @@ call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
 	call(resort(NewRest,NewHooks,Meta), Config, Meta, NewHooks)
     catch Error:Reason ->
 	    Trace = erlang:get_stacktrace(),
-	    ct_logs:log("Suite Hook","Failed to start a CTH: ~p:~p",
+	    ct_logs:log("Suite Hook","Failed to start a CTH: ~tp:~tp",
 			[Error,{Reason,Trace}]),
 	    call([], {fail,"Failed to start CTH"
 		      ", see the CT Log for details"}, Meta, Hooks)
@@ -424,11 +424,11 @@ catch_apply(M,F,A) ->
         erlang:apply(M,F,A)
     catch _:Reason ->
             Trace = erlang:get_stacktrace(),
-            ct_logs:log("Suite Hook","Call to CTH failed: ~w:~p",
+            ct_logs:log("Suite Hook","Call to CTH failed: ~w:~tp",
                             [error,{Reason,Trace}]),
             throw({error_in_cth_call,
                    lists:flatten(
-                     io_lib:format("~w:~w/~w CTH call failed",
+                     io_lib:format("~w:~tw/~w CTH call failed",
                                    [M,F,length(A)]))})
     end.
 
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 978af0f149..ba7660fe6a 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -139,7 +139,7 @@ close(Info, StartDir) ->
     LogCacheBin = 
 	case make_last_run_index() of
 	    {error, Reason} ->  % log server not responding
-		io:format("Warning! ct_logs not responding: ~p~n", [Reason]),
+		io:format("Warning! ct_logs not responding: ~tp~n", [Reason]),
 		undefined;
 	    LCB ->
 		LCB
@@ -175,7 +175,7 @@ close(Info, StartDir) ->
 		ok ->
 		    ok;
 		Error ->
-		    io:format("Warning! Cleanup failed: ~p~n", [Error])
+		    io:format("Warning! Cleanup failed: ~tp~n", [Error])
 	    end,
 	    _ = make_all_suites_index(stop),
 	    make_all_runs_index(stop),
@@ -425,7 +425,7 @@ add_external_logs(Logs) ->
 %%% @doc Print a link to a given file stored in the priv_dir of the
 %%% calling test suite.
 add_link(Heading,File,Type) ->
-    log(Heading,"<a href=\"~ts\" type=~p>~ts</a>\n",
+    log(Heading,"<a href=\"~ts\" type=~tp>~ts</a>\n",
 	[uri(filename:join("log_private",File)),Type,File]).
 
 
@@ -567,7 +567,7 @@ get_header("default") ->
 		  [log_timestamp(?now)]);
 get_header(Heading) ->
     io_lib:format("\n-----------------------------"
-		  "-----------------------\n~s ~s\n",
+		  "-----------------------\n~ts ~s\n",
 		  [Heading,log_timestamp(?now)]).    
     
 
@@ -704,8 +704,8 @@ logger(Parent, Mode, Verbosity) ->
 	    case copy_priv_files(PrivFilesSrc, PrivFilesDestTop) of
 		{error,Src1,Dest1,Reason1} ->
 		    io:format(?def_gl, "ERROR! "++
-				  "Priv file ~p could not be copied to ~p. "++
-				  "Reason: ~p~n",
+				  "Priv file ~tp could not be copied to ~tp. "++
+				  "Reason: ~tp~n",
 			      [Src1,Dest1,Reason1]),
 		    exit({priv_file_error,Dest1});
 		ok ->
@@ -713,8 +713,8 @@ logger(Parent, Mode, Verbosity) ->
 			{error,Src2,Dest2,Reason2} ->
 			    io:format(?def_gl,
 				      "ERROR! "++
-				      "Priv file ~p could not be copied to ~p. "
-				      ++"Reason: ~p~n",
+				      "Priv file ~tp could not be copied to ~tp. "
+				      ++"Reason: ~tp~n",
 				      [Src2,Dest2,Reason2]),
 			    exit({priv_file_error,Dest2});
 			ok ->
@@ -891,7 +891,7 @@ logger_loop(State) ->
 	    logger_loop(State);
 	{set_stylesheet,TC,SSFile} ->
 	    Fd = State#logger_state.ct_log_fd,
-	    io:format(Fd, "~p loading external style sheet: ~ts~n",
+	    io:format(Fd, "~tp loading external style sheet: ~ts~n",
 		      [TC,SSFile]),
 	    logger_loop(State#logger_state{stylesheet = SSFile});
 	{clear_stylesheet,_} when State#logger_state.stylesheet == undefined ->
@@ -952,7 +952,7 @@ create_io_fun(FromPid, CtLogFd, EscChars) ->
 		    [IoList,"\n",IoStr]
 	    catch
 		_:_Reason ->
-		    io:format(CtLogFd, "Logging fails! Str: ~p, Args: ~p~n",
+		    io:format(CtLogFd, "Logging fails! Str: ~tp, Args: ~tp~n",
 			      [Str,Args]),
 		    %% stop the testcase, we need to see the fault
 		    exit(FromPid, {log_printout_error,Str,Args}),
@@ -1151,7 +1151,7 @@ open_ctlog(MiscIoName) ->
 	    Dir = filename:dirname(Cwd),
 	    Variables = ct_run:variables_file_name(Dir),
 	    io:format(Fd,
-		      "Can not read the file \'~ts\' Reason: ~w\n"
+		      "Can not read the file \'~ts\' Reason: ~tw\n"
 		      "No configuration found for test!!\n",
 		      [Variables,Reason])
     end,
@@ -1213,7 +1213,7 @@ print_style(Fd, IoFormat, StyleSheet) ->
     end.
 
 print_style_error(Fd, IoFormat, StyleSheet, Reason) ->
-    IO = io_lib:format("\n<!-- Failed to load stylesheet ~ts: ~p -->\n",
+    IO = io_lib:format("\n<!-- Failed to load stylesheet ~ts: ~tp -->\n",
 		       [StyleSheet,Reason]),
     IoFormat(Fd, IO, []),
     print_style(Fd, IoFormat, undefined).
@@ -1256,11 +1256,11 @@ make_last_run_index(StartTime) ->
 	case catch make_last_run_index1(StartTime,IndexName) of
 	    {'EXIT', Reason} ->
 		io:put_chars("CRASHED while updating " ++ AbsIndexName ++ "!\n"),
-		io:format("~p~n", [Reason]),
+		io:format("~tp~n", [Reason]),
 		{error, Reason};
 	    {error, Reason} ->
 		io:put_chars("FAILED while updating " ++ AbsIndexName ++ "\n"),
-		io:format("~p~n", [Reason]),
+		io:format("~tp~n", [Reason]),
 		{error, Reason};
 	    ok ->
 		ok;
@@ -1561,7 +1561,7 @@ get_missing_suites(_,_) ->
     [].
 
 term_to_text(Term) ->
-    lists:flatten(io_lib:format("~p.\n", [Term])).
+    lists:flatten(io_lib:format("~tp.\n", [Term])).
 
 
 %%% Headers and footers.
@@ -1829,7 +1829,7 @@ count_cases(Dir) ->
 			    Summary
 		    end;
 		{error, Reason} ->
-		    io:format("\nFailed to read ~p: ~p (skipped)\n",
+		    io:format("\nFailed to read ~tp: ~tp (skipped)\n",
 			      [LogFile,Reason]),
 		    error
 	    end
@@ -1911,10 +1911,10 @@ config_table_header() ->
 
 config_table1([{Key,Value}|Vars]) ->
     [xhtml(["<tr><td>", atom_to_list(Key), "</td>\n",
-	   "<td><pre>",io_lib:format("~p",[Value]),"</pre></td></tr>\n"],
+	   "<td><pre>",io_lib:format("~tp",[Value]),"</pre></td></tr>\n"],
 	   ["<tr class=\"", odd_or_even(), "\">\n",
 	    "<td>", atom_to_list(Key), "</td>\n",
-	    "<td>", io_lib:format("~p",[Value]), "</td>\n</tr>\n"]) |
+	    "<td>", io_lib:format("~tp",[Value]), "</td>\n</tr>\n"]) |
      config_table1(Vars)];
 config_table1([]) ->
     [xhtml("","</tbody>\n"),"</table>\n"].
@@ -2474,17 +2474,17 @@ make_all_suites_index(NewTestData = {_TestName,DirName}) ->
 					   LogDirData) of
 	    {'EXIT',Reason} ->
 		io:put_chars("CRASHED while updating " ++ AbsIndexName ++ "!\n"),
-		io:format("~p~n", [Reason]),
+		io:format("~tp~n", [Reason]),
 		{error,Reason};
 	    {error,Reason} ->
 		io:put_chars("FAILED while updating " ++ AbsIndexName ++ "\n"),
-		io:format("~p~n", [Reason]),
+		io:format("~tp~n", [Reason]),
 		{error,Reason};
 	    ok ->
 		ok;
 	    Err ->
 		io:format("Unknown internal error while updating ~ts. "
-			  "Please report.\n(Err: ~p, ID: 1)",
+			  "Please report.\n(Err: ~tp, ID: 1)",
 			  [AbsIndexName,Err]),
 		{error, Err}
 	end,
@@ -2703,11 +2703,11 @@ make_all_suites_index1(When, AbsIndexName, AllTestLogDirs) ->
     case catch make_all_suites_index2(IndexName, AllTestLogDirs) of
 	{'EXIT', Reason} ->
 	    io:put_chars("CRASHED while updating " ++ AbsIndexName ++ "!\n"),
-	    io:format("~p~n", [Reason]),
+	    io:format("~tp~n", [Reason]),
 	    {error, Reason};
 	{error, Reason} ->
 	    io:put_chars("FAILED while updating " ++ AbsIndexName ++ "\n"),
-	    io:format("~p~n", [Reason]),
+	    io:format("~tp~n", [Reason]),
 	    {error, Reason};
 	{ok,TempData} ->
 	    case When of
@@ -2721,7 +2721,7 @@ make_all_suites_index1(When, AbsIndexName, AllTestLogDirs) ->
 	    end;
 	Err ->
 	    io:format("Unknown internal error while updating ~ts. "
-		      "Please report.\n(Err: ~p, ID: 1)",
+		      "Please report.\n(Err: ~tp, ID: 1)",
 		      [AbsIndexName,Err]),
 	    {error, Err}
     end.
@@ -3200,7 +3200,7 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
     TestName1 = if is_list(TestName) ->
 			lists:flatten(TestName);
 		   true ->
-			lists:flatten(io_lib:format("~p", [TestName]))
+			lists:flatten(io_lib:format("~tp", [TestName]))
 		end,
     Basic = basic_html(),
     LabelStr =
diff --git a/lib/common_test/src/ct_make.erl b/lib/common_test/src/ct_make.erl
index f22959d457..6c6fb99c72 100644
--- a/lib/common_test/src/ct_make.erl
+++ b/lib/common_test/src/ct_make.erl
@@ -96,7 +96,7 @@ read_emakefile(Emakefile,Opts) ->
 	    Mods = [filename:rootname(F) ||  F <- filelib:wildcard("*.erl")],
 	    [{Mods, Opts}];
 	{error,Other} ->
-	    io:format("make: Trouble reading 'Emakefile':~n~p~n",[Other]),
+	    io:format("make: Trouble reading 'Emakefile':~n~tp~n",[Other]),
 	    error
     end.
 
@@ -151,7 +151,7 @@ get_opts_from_emakefile(Mods,Emakefile,Opts) ->
 	{error,enoent} ->
 	    [{Mods, Opts}];
 	{error,Other} ->
-	    io:format("make: Trouble reading 'Emakefile':~n~p~n",[Other]),
+	    io:format("make: Trouble reading 'Emakefile':~n~tp~n",[Other]),
 	    error
     end.
 
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index 4eef27d2a5..e692df891d 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -434,7 +434,7 @@ init_master1(Parent,NodeOptsList,InitOptions,LogDirs) ->
 init_master2(Parent,NodeOptsList,LogDirs) ->
     process_flag(trap_exit,true),
     Cookie = erlang:get_cookie(),
-    log(all,"Cookie","~w",[Cookie]),
+    log(all,"Cookie","~tw",[Cookie]),
     log(all,"Starting Tests",
 	"Tests starting on: ~p",[[N || {N,_} <- NodeOptsList]]),
     SpawnAndMon = 
@@ -454,7 +454,7 @@ master_loop(#state{node_ctrl_pids=[],
 		   results=Finished}) ->
     Str =
 	lists:map(fun({Node,Result}) ->
-			  io_lib:format("~-40.40.*ts~p\n",
+			  io_lib:format("~-40.40.*ts~tp\n",
 					[$_,atom_to_list(Node),Result])
 		  end,lists:reverse(Finished)),
     log(all,"TEST RESULTS",Str,[]),
@@ -488,7 +488,7 @@ master_loop(State=#state{node_ctrl_pids=NodeCtrlPids,
 					Bad
 				end,
 			    log(all,"Test Info",
-				"Test on node ~w failed! Reason: ~p",
+				"Test on node ~w failed! Reason: ~tp",
 				[Node,Error]),
 			    {Locks1,Blocked1} = 
 				update_queue(exit,Node,Locks,Blocked),
@@ -501,7 +501,7 @@ master_loop(State=#state{node_ctrl_pids=NodeCtrlPids,
 		undefined ->
 		    %% ignore (but report) exit from master_logger etc
 		    log(all,"Test Info",
-			"Warning! Process ~w has terminated. Reason: ~p",
+			"Warning! Process ~w has terminated. Reason: ~tp",
 			[Pid,Reason]),
 			master_loop(State)
 	    end;
@@ -584,7 +584,7 @@ update_queue(take,Node,From,Lock={Op,Resource},Locks,Blocked) ->
     %% Blocked: [{{Operation,Resource},Node,WaitingPid},...]
     case lists:keysearch(Lock,1,Locks) of
 	{value,{_Lock,Owner}} ->		% other node has lock
-	    log(html,"Lock Info","Node ~w blocked on ~w by ~w. Resource: ~p",
+	    log(html,"Lock Info","Node ~w blocked on ~w by ~w. Resource: ~tp",
 		[Node,Op,Owner,Resource]),
 	    Blocked1 = Blocked ++ [{Lock,Node,From}],
 	    {Locks,Blocked1};
@@ -599,7 +599,7 @@ update_queue(release,Node,_From,Lock={Op,Resource},Locks,Blocked) ->
     case lists:keysearch(Lock,1,Blocked) of
 	{value,E={Lock,SomeNode,WaitingPid}} ->
 	    Blocked1 = lists:delete(E,Blocked),
-	    log(html,"Lock Info","Node ~w proceeds with ~w. Resource: ~p",
+	    log(html,"Lock Info","Node ~w proceeds with ~w. Resource: ~tp",
 		[SomeNode,Op,Resource]),
 	    reply(ok,WaitingPid),		% waiting process may start
 	    {Locks1,Blocked1};
@@ -678,7 +678,7 @@ refresh_logs([D|Dirs],Refreshed) ->
 refresh_logs([],Refreshed) ->
     Str =
 	lists:map(fun({D,Result}) ->
-			  io_lib:format("Refreshing logs in ~p... ~p",
+			  io_lib:format("Refreshing logs in ~tp... ~tp",
 					[D,Result])
 		  end,Refreshed),
     log(all,"Info",Str,[]).
@@ -712,7 +712,7 @@ init_node_ctrl(MasterPid,Cookie,Opts) ->
     {ok, _} = start_ct_event(),
     ct_event:add_handler([{master,MasterPid}]),
 
-    %% log("Running test with options: ~p~n", [Opts]),
+    %% log("Running test with options: ~tp~n", [Opts]),
     Result = case (catch ct:run_test(Opts)) of
 		 ok -> finished_ok;
 		 Other -> Other
@@ -828,7 +828,7 @@ start_nodes(InitOptions)->
 				  "with callback ~w~n", [NodeName,Callback]);
 		    {error, Reason, _NodeName} ->
 			io:format("Failed to start node ~w with callback ~w! "
-				  "Reason: ~p~n", [NodeName, Callback, Reason])
+				  "Reason: ~tp~n", [NodeName, Callback, Reason])
 		end;
 	    {true, true}->
 		io:format("WARNING: Node ~w is alive but has node_start "
@@ -857,10 +857,10 @@ eval_on_nodes(InitOptions)->
 evaluate(Node, [{M,F,A}|MFAs])->
     case rpc:call(Node, M, F, A) of
         {badrpc,Reason}->
-	    io:format("WARNING: Failed to call ~w:~w/~w on node ~w "
-		      "due to ~p~n", [M,F,length(A),Node,Reason]);
+	    io:format("WARNING: Failed to call ~w:~tw/~w on node ~w "
+		      "due to ~tp~n", [M,F,length(A),Node,Reason]);
 	Result->
-	    io:format("Called ~w:~w/~w on node ~w, result: ~p~n",
+	    io:format("Called ~w:~tw/~w on node ~w, result: ~tp~n",
 		      [M,F,length(A),Node,Result])
     end,
     evaluate(Node, MFAs);
diff --git a/lib/common_test/src/ct_master_event.erl b/lib/common_test/src/ct_master_event.erl
index d28ef42c20..c05a05c891 100644
--- a/lib/common_test/src/ct_master_event.erl
+++ b/lib/common_test/src/ct_master_event.erl
@@ -71,7 +71,7 @@ stop() ->
 	{error,Reason} ->
 	    ct_master_logs:log("Error",
 			       "No response from CT Master Event.\n"
-			       "Reason = ~p\n"
+			       "Reason = ~tp\n"
 			       "Terminating now!\n",[Reason]),
 	    %% communication with event manager fails, kill it
 	    catch exit(whereis(?CT_MEVMGR_REF), kill);
@@ -135,7 +135,7 @@ handle_event(#event{name=start_logging,node=Node,data=RunDir},State) ->
 
 handle_event(#event{name=Name,node=Node,data=Data},State) ->
     print("~n=== ~w ===~n", [?MODULE]),
-    print("~w on ~w: ~p~n", [Name,Node,Data]),
+    print("~tw on ~w: ~tp~n", [Name,Node,Data]),
     {ok,State}.
 
 %%--------------------------------------------------------------------
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index 52003f752d..985eb9063d 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -110,16 +110,16 @@ init(Parent,LogDir,Nodes) ->
 	    case copy_priv_files(PrivFilesSrc, PrivFilesDestTop) of
 		{error,Src1,Dest1,Reason1} ->
 		    io:format(user, "ERROR! "++
-			      "Priv file ~p could not be copied to ~p. "++
-			      "Reason: ~p~n",
+			      "Priv file ~tp could not be copied to ~tp. "++
+			      "Reason: ~tp~n",
 			      [Src1,Dest1,Reason1]),
 		    exit({priv_file_error,Dest1});
 		ok ->
 		    case copy_priv_files(PrivFilesSrc, PrivFilesDestRun) of
 			{error,Src2,Dest2,Reason2} ->
 			    io:format(user, "ERROR! "++
-				      "Priv file ~p could not be copied to ~p. "++
-				      "Reason: ~p~n",
+				      "Priv file ~tp could not be copied to ~tp. "++
+				      "Reason: ~tp~n",
 				      [Src2,Dest2,Reason2]),
 			    exit({priv_file_error,Dest2});
 			ok ->
@@ -170,7 +170,7 @@ loop(State) ->
 			case catch io:format(Fd,Str++"\n",Args) of
 			    {'EXIT',Reason} ->
 				io:format(Fd, 
-					  "Logging fails! Str: ~p, Args: ~p~n",
+					  "Logging fails! Str: ~tp, Args: ~tp~n",
 					  [Str,Args]),
 				exit({logging_failed,Reason}),
 				ok;
diff --git a/lib/common_test/src/ct_master_status.erl b/lib/common_test/src/ct_master_status.erl
index 7d3e54e645..0f91faadd1 100644
--- a/lib/common_test/src/ct_master_status.erl
+++ b/lib/common_test/src/ct_master_status.erl
@@ -71,7 +71,7 @@ init(_) ->
 %%
 handle_event(#event{name=Name,node=Node,data=Data},State) ->
     print("~n=== ~w ===~n", [?MODULE]),
-    print("~w on ~w: ~p~n", [Name,Node,Data]),
+    print("~tw on ~w: ~tp~n", [Name,Node,Data]),
     {ok,State}.
 
 %%--------------------------------------------------------------------
diff --git a/lib/common_test/src/ct_property_test.erl b/lib/common_test/src/ct_property_test.erl
index 12c3d726d3..07acbab8f0 100644
--- a/lib/common_test/src/ct_property_test.erl
+++ b/lib/common_test/src/ct_property_test.erl
@@ -134,7 +134,7 @@ mk_ct_return(Other, Tool) ->
     try lists:last(hd(Tool:counterexample()))
     of
 	{set,{var,_},{call,M,F,Args}} ->
-	    {fail, io_lib:format("~p:~p/~p returned bad result",[M,F,length(Args)])}
+	    {fail, io_lib:format("~p:~tp/~p returned bad result",[M,F,length(Args)])}
     catch
 	_:_ ->
 	    {fail, Other}
@@ -174,7 +174,7 @@ compile_tests(Path, ToolModule) ->
     BeamFiles = [F || F<-FileNames,
 		      filename:extension(F) == ".beam"],
     _ = [file:delete(F) || F<-BeamFiles],
-    ct:pal("Compiling in ~p:~n  Deleted ~p~n  MacroDefs=~p",[Path,BeamFiles,MacroDefs]),
+    ct:pal("Compiling in ~tp:~n  Deleted ~p~n  MacroDefs=~p",[Path,BeamFiles,MacroDefs]),
     Result = make:all([load|MacroDefs]),
     ok = file:set_cwd(Cwd),
     Result.
diff --git a/lib/common_test/src/ct_release_test.erl b/lib/common_test/src/ct_release_test.erl
index 6e3cad0a50..551a7e06d7 100644
--- a/lib/common_test/src/ct_release_test.erl
+++ b/lib/common_test/src/ct_release_test.erl
@@ -445,7 +445,7 @@ init_upgrade_test(Level) ->
 	end,
     case OldRel of
 	false ->
-	    ct:log("Release ~p is not available."
+	    ct:log("Release ~tp is not available."
 		   " Upgrade on '~p' level can not be tested.",
 		   [FromVsn,Level]),
 	    undefined;
@@ -522,8 +522,8 @@ upgrade(Apps,Level,Callback,CreateDir,InstallDir,Config) ->
 		    {ToVsn,ToRel,ToAppsVsns} =
 			upgrade_system(Apps, FromRel, CreateDir,
 				       InstallDir, Data),
-		    ct:log("Upgrade from: OTP-~ts, ~p",[FromVsn, FromAppsVsns]),
-		    ct:log("Upgrade to: OTP-~ts, ~p",[ToVsn, ToAppsVsns]),
+		    ct:log("Upgrade from: OTP-~ts, ~tp",[FromVsn, FromAppsVsns]),
+		    ct:log("Upgrade to: OTP-~ts, ~tp",[ToVsn, ToAppsVsns]),
 		    do_upgrade(Callback, FromVsn, FromAppsVsns, ToRel,
 			       ToAppsVsns, InstallDir)
 	    end
@@ -727,9 +727,9 @@ do_upgrade({Cb,InitState},FromVsn,FromAppsVsns,ToRel,ToAppsVsns,InstallDir) ->
 do_callback(Node,Mod,Func,Args) ->
     Dir = filename:dirname(code:which(Mod)),
     _ = rpc:call(Node,code,add_path,[Dir]),
-    ct:log("Calling ~p:~p/1",[Mod,Func]),
+    ct:log("Calling ~p:~tp/1",[Mod,Func]),
     R = rpc:call(Node,Mod,Func,Args),
-    ct:log("~p:~p/~w returned: ~p",[Mod,Func,length(Args),R]),
+    ct:log("~p:~tp/~w returned: ~tp",[Mod,Func,length(Args),R]),
     case R of
 	{badrpc,Error} ->
 	    throw({fail,{test_upgrade_callback,Mod,Func,Args,Error}});
@@ -860,10 +860,7 @@ copy_file(Src, Dest, Opts) ->
     end.
 
 write_file(FName, Conts) ->
-    Enc = file:native_name_encoding(),
-    {ok, Fd} = file:open(FName, [write]),
-    ok = file:write(Fd, unicode:characters_to_binary(Conts,Enc,Enc)),
-    ok = file:close(Fd).
+    file:write_file(FName, unicode:characters_to_binary(Conts)).
 
 %% Substitute all occurrences of %Var% for Val in the given scripts
 subst_src_scripts(Scripts, SrcDir, DestDir, Vars, Opts) ->
@@ -879,7 +876,7 @@ subst_src_script(Script, SrcDir, DestDir, Vars, Opts) ->
 
 subst_file(Src, Dest, Vars, Opts) ->
     {ok, Bin} = file:read_file(Src),
-    Conts = binary_to_list(Bin),
+    Conts = unicode:characters_to_list(Bin),
     NConts = subst(Conts, Vars),
     write_file(Dest, NConts),
     case lists:member(preserve, Opts) of
@@ -891,7 +888,7 @@ subst_file(Src, Dest, Vars, Opts) ->
     end.
 
 subst(Str, [{Var,Val}|Vars]) ->
-    subst(re:replace(Str,"%"++Var++"%",Val,[{return,list}]),Vars);
+    subst(re:replace(Str,"%"++Var++"%",Val,[{return,list},unicode]),Vars);
 subst(Str, []) ->
     Str.
 
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index dac596a135..2bd1f7981a 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -43,7 +43,7 @@ loop_test(If,Args) when is_list(Args) ->
 	no_loop ->
 	    false;
 	E = {error,_} ->
-	    io:format("Common Test error: ~p\n\n",[E]),
+	    io:format("Common Test error: ~tp\n\n",[E]),
 	    ok = file:set_cwd(Cwd),
 	    E;
 	{repeat,N} ->
@@ -89,18 +89,18 @@ loop(If,Type,N,Data0,Data1,Args,TPid,AccResult) ->
 	{'EXIT',Pid,Reason} ->
 	    case Reason of
 		{user_error,What} ->
-		    io:format("\nTest run failed!\nReason: ~p\n\n\n", [What]),
+		    io:format("\nTest run failed!\nReason: ~tp\n\n\n", [What]),
 		    cancel(TPid),
 		    {error,What};			
 		_ ->
 		    io:format("Test run crashed! This could be an internal error "
 			      "- please report!\n\n"
-			      "~p\n\n\n",[Reason]),
+			      "~tp\n\n\n",[Reason]),
 		    cancel(TPid),
 		    {error,Reason}
 	    end;
 	{Pid,{error,Reason}} ->
-	    io:format("\nTest run failed!\nReason: ~p\n\n\n",[Reason]),
+	    io:format("\nTest run failed!\nReason: ~tp\n\n\n",[Reason]),
 	    cancel(TPid),
 	    {error,Reason};
 	{Pid,Result} ->
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index ce30babc0d..14f28f9ca3 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -121,13 +121,13 @@ script_start() ->
 		%% used for purpose of testing the run_test interface
 		io:format(user, "~n-------------------- START ARGS "
 			  "--------------------~n", []),
-		io:format(user, "--- Init args:~n~p~n", [FlagFilter(Init)]),
-		io:format(user, "--- CT args:~n~p~n", [FlagFilter(CtArgs)]),
+		io:format(user, "--- Init args:~n~tp~n", [FlagFilter(Init)]),
+		io:format(user, "--- CT args:~n~tp~n", [FlagFilter(CtArgs)]),
 		EnvArgs = opts2args(EnvStartOpts),
-		io:format(user, "--- Env opts -> args:~n~p~n   =>~n~p~n",
+		io:format(user, "--- Env opts -> args:~n~tp~n   =>~n~tp~n",
 			  [EnvStartOpts,EnvArgs]),
 		Merged = merge_arguments(CtArgs ++ EnvArgs),
-		io:format(user, "--- Merged args:~n~p~n", [FlagFilter(Merged)]),
+		io:format(user, "--- Merged args:~n~tp~n", [FlagFilter(Merged)]),
 		io:format(user, "-----------------------------------"
 			  "-----------------~n~n", []),
 		Merged;
@@ -160,18 +160,18 @@ script_start(Args) ->
 		{'EXIT',Pid,Reason} ->
 		    case Reason of
 			{user_error,What} ->
-			    io:format("\nTest run failed!\nReason: ~p\n\n\n",
+			    io:format("\nTest run failed!\nReason: ~tp\n\n\n",
                                       [What]),
 			    finish(Tracing, ?EXIT_STATUS_TEST_RUN_FAILED, Args);
 			_ ->
 			    io:format("Test run crashed! "
                                       "This could be an internal error "
 				      "- please report!\n\n"
-				      "~p\n\n\n", [Reason]),
+				      "~tp\n\n\n", [Reason]),
 			    finish(Tracing, ?EXIT_STATUS_TEST_RUN_FAILED, Args)
 		    end;
 		{Pid,{error,Reason}} ->
-		    io:format("\nTest run failed! Reason:\n~p\n\n\n",[Reason]),
+		    io:format("\nTest run failed! Reason:\n~tp\n\n\n",[Reason]),
 		    finish(Tracing, ?EXIT_STATUS_TEST_RUN_FAILED, Args);
 		{Pid,Result} ->
 		    io:nl(),
@@ -219,7 +219,7 @@ analyze_test_result([], _) ->
 analyze_test_result(interactive_mode, _) ->
     interactive_mode;
 analyze_test_result(Unknown, _) ->
-    io:format("\nTest run failed! Reason:\n~p\n\n\n",[Unknown]),
+    io:format("\nTest run failed! Reason:\n~tp\n\n\n",[Unknown]),
     ?EXIT_STATUS_TEST_RUN_FAILED.
 
 finish(Tracing, ExitStatus, Args) ->
@@ -760,7 +760,7 @@ script_start4(#opts{label = Label, profile = Profile,
     if Config == [] ->
 	    ok;
        true ->
-	    io:format("\nInstalling: ~p\n\n", [Config])
+	    io:format("\nInstalling: ~tp\n\n", [Config])
     end,
     case install([{config,Config},{event_handler,EvHandlers},
 		  {ct_hooks, CTHooks},
@@ -909,9 +909,9 @@ install(Opts, LogDir) ->
     case whereis(ct_util_server) of
 	undefined ->
 	    VarFile = variables_file_name(LogDir),
-	    case file:open(VarFile, [write]) of
+	    case file:open(VarFile, [write, {encoding,utf8}]) of
 		{ok,Fd} ->
-		    _ = [io:format(Fd, "~p.\n", [Opt]) || Opt <- ConfOpts],
+		    _ = [io:format(Fd, "~tp.\n", [Opt]) || Opt <- ConfOpts],
 		    ok = file:close(Fd);
 		{error,Reason} ->
 		    io:format("CT failed to install configuration data. Please "
@@ -1828,10 +1828,10 @@ compile_and_run(Tests, Skip, Opts, Args) ->
 	    case lists:member(all, Conns) of
 		true ->
 		    Conns1 = ct_util:override_silence_all_connections(),
-		    ct_logs:log("Silent connections", "~p", [Conns1]);
+		    ct_logs:log("Silent connections", "~tp", [Conns1]);
 		false ->
 		    ct_util:override_silence_connections(Conns),
-		    ct_logs:log("Silent connections", "~p", [Conns])
+		    ct_logs:log("Silent connections", "~tp", [Conns])
 	    end
     end,
     log_ts_names(Opts#opts.testspec_files),
@@ -1924,7 +1924,7 @@ possibly_spawn(true, Tests, Skip, Opts) ->
 		TestRunPid = spawn_link(TestRun),
 		receive
 		    {'EXIT',TestRunPid,{ok,TestResult}} ->
-			io:format(user, "~nCommon Test returned ~p~n~n",
+			io:format(user, "~nCommon Test returned ~tp~n~n",
 				  [TestResult]);
 		    {'EXIT',TestRunPid,Error} ->
 			exit(Error)				
@@ -1943,7 +1943,7 @@ auto_compile(TestSuites) ->
 	case application:get_env(common_test, include) of
 	    {ok,UserInclDirs} when length(UserInclDirs) > 0 ->
 		io:format("Including the following directories:~n"),
-		[begin io:format("~p~n",[UserInclDir]), {i,UserInclDir} end ||
+		[begin io:format("~tp~n",[UserInclDir]), {i,UserInclDir} end ||
 		 UserInclDir <- UserInclDirs];
 	    _ ->
 		[]
@@ -2284,7 +2284,7 @@ do_run_test(Tests, Skip, Opts0) ->
 	    NoOfSuites = length(Suites1),
 	    ct_util:warn_duplicates(Suites1),
 	    {ok,Cwd} = file:get_cwd(),
-	    io:format("~nCWD set to: ~p~n", [Cwd]),
+	    io:format("~nCWD set to: ~tp~n", [Cwd]),
 	    if NoOfCases == unknown ->
 		    io:format("~nTEST INFO: ~w test(s), ~w suite(s)~n~n",
 			      [NoOfTests,NoOfSuites]),
@@ -2354,7 +2354,7 @@ do_run_test(Tests, Skip, Opts0) ->
 	    case ct_util:get_testdata(severe_error) of
 		undefined -> ok;
 		SevereError ->
-		    ct_logs:log("SEVERE ERROR", "~p\n", [SevereError]),
+		    ct_logs:log("SEVERE ERROR", "~tp\n", [SevereError]),
 		    exit(SevereError)
 	    end,
 
@@ -2425,7 +2425,7 @@ start_cover(Opts=#opts{coverspec=CovData,cover_stop=CovStop},LogDir) ->
     if (CovNodes /= []) and (CovNodes /= undefined) ->
 	    ct_logs:log("COVER INFO",
 			"Nodes included in cover "
-			"session: ~w",
+			"session: ~tw",
 			[CovNodes]),
 	    cover:start(CovNodes);
        true ->
@@ -2439,7 +2439,7 @@ start_cover(Opts=#opts{coverspec=CovData,cover_stop=CovStop},LogDir) ->
 		  {error,Reason} ->
 		      ct_logs:log("COVER INFO",
 				  "Importing cover data from: ~ts fails! "
-				  "Reason: ~p", [Imp,Reason])
+				  "Reason: ~tp", [Imp,Reason])
 	      end
       end, CovImport),
     {TsCoverInfo,Opts}.
@@ -2773,7 +2773,7 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 		{up_to_date,_} ->
 		    ok;
 		{'EXIT',Reason} ->
-		    io:format("{error,{make_crashed,~p}\n", [Reason]),
+		    io:format("{error,{make_crashed,~tp}\n", [Reason]),
 		    {error,{make_crashed,TestDir,Reason}};
 		{error,ModInfo} ->
 		    io:format("{error,make_failed}\n", []),
@@ -2782,7 +2782,7 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 		    {error,{make_failed,Bad}}
 	    end;
 	{error,_} ->
-	    io:format("{error,{invalid_directory,~p}}\n", [TestDir0]),
+	    io:format("{error,{invalid_directory,~tp}}\n", [TestDir0]),
 	    {error,{invalid_directory,TestDir0}}
     end.
 
@@ -2832,7 +2832,7 @@ maybe_interpret2(Suite, Cases, StepOpts) ->
 	       _ -> ok
 	   catch
 	       _:_Error ->
-		   io:format(user, "Invalid breakpoint: ~w:~w/1~n",
+		   io:format(user, "Invalid breakpoint: ~w:~tw/1~n",
 			     [Suite,Case])
 	   end
  	 end || Case <- Cases, is_atom(Case)],
@@ -2963,7 +2963,7 @@ ct_hooks_args2opts([],Acc) ->
 
 parse_cth_args(String) ->
     try
-	true = io_lib:printable_list(String),
+	true = io_lib:printable_unicode_list(String),
 	{ok,Toks,_} = erl_scan:string(String++"."),
 	{ok, Args} = erl_parse:parse_term(Toks),
 	Args
@@ -3042,7 +3042,7 @@ rel_to_abs(CtArgs) ->
 	 _ = if Dir /= Abs ->
 		 _ = code:del_path(Dir),
 		 _ = code:del_path(Abs),		 
-		 io:format(user, "Converting ~p to ~p and re-inserting "
+		 io:format(user, "Converting ~tp to ~tp and re-inserting "
 			   "with add_pathz/1~n",
 			   [Dir, Abs]);
 	    true ->
@@ -3056,7 +3056,7 @@ rel_to_abs(CtArgs) ->
 	 _ = if Dir /= Abs ->
 		 _ = code:del_path(Dir),
 		 _ = code:del_path(Abs),		 
-		 io:format(user, "Converting ~p to ~p and re-inserting "
+		 io:format(user, "Converting ~tp to ~tp and re-inserting "
 			   "with add_patha/1~n",
 			   [Dir, Abs]);
 	    true ->
@@ -3126,7 +3126,7 @@ opts2args(EnvStartOpts) ->
 		     ({group,G}) when is_atom(G) ->
 			  [{group,[atom_to_list(G)]}];
 		     ({group,Gs}) when is_list(Gs) ->
-			  LOfGStrs = [lists:flatten(io_lib:format("~w",[G])) ||
+			  LOfGStrs = [lists:flatten(io_lib:format("~tw",[G])) ||
 					 G <- Gs],
 			  [{group,LOfGStrs}];
 		     ({testcase,Case}) when is_atom(Case) ->
@@ -3178,10 +3178,10 @@ opts2args(EnvStartOpts) ->
 		     ({event_handler,EHs}) when is_list(EHs) ->
 			  [{event_handler,[atom_to_list(EH) || EH <- EHs]}];
 		     ({event_handler,{EH,Arg}}) when is_atom(EH) ->
-			  ArgStr = lists:flatten(io_lib:format("~p", [Arg])),
+			  ArgStr = lists:flatten(io_lib:format("~tp", [Arg])),
 			  [{event_handler_init,[atom_to_list(EH),ArgStr]}];
 		     ({event_handler,{EHs,Arg}}) when is_list(EHs) ->
-			  ArgStr = lists:flatten(io_lib:format("~p", [Arg])),
+			  ArgStr = lists:flatten(io_lib:format("~tp", [Arg])),
 			  Strs = lists:flatmap(fun(EH) ->
 						       [atom_to_list(EH),
 							ArgStr,"and"]
@@ -3212,25 +3212,25 @@ opts2args(EnvStartOpts) ->
 		     ({ct_hooks,[]}) ->
 			  [];
 		     ({ct_hooks,CTHs}) when is_list(CTHs) ->
-			  io:format(user,"ct_hooks: ~p",[CTHs]),
+			  io:format(user,"ct_hooks: ~tp",[CTHs]),
 			  Strs = lists:flatmap(
 				   fun({CTH,Arg,Prio}) ->
 					   [atom_to_list(CTH),
 					    lists:flatten(
-					      io_lib:format("~p",[Arg])),
+					      io_lib:format("~tp",[Arg])),
 					    lists:flatten(
-					      io_lib:format("~p",[Prio])),
+					      io_lib:format("~tp",[Prio])),
 					    "and"];
 				       ({CTH,Arg}) ->
 					   [atom_to_list(CTH),
 					    lists:flatten(
-					      io_lib:format("~p",[Arg])),
+					      io_lib:format("~tp",[Arg])),
 					    "and"];
 				      (CTH) when is_atom(CTH) ->
 					   [atom_to_list(CTH),"and"]
 				   end,CTHs),
 			  [_LastAnd|StrsR] = lists:reverse(Strs),
-			  io:format(user,"return: ~p",[lists:reverse(StrsR)]),
+			  io:format(user,"return: ~tp",[lists:reverse(StrsR)]),
 			  [{ct_hooks,lists:reverse(StrsR)}];
 		     ({Opt,As=[A|_]}) when is_atom(A) ->
 			  [{Opt,[atom_to_list(Atom) || Atom <- As]}];
@@ -3312,7 +3312,7 @@ start_trace(Args) ->
 			ok ->
 			    true;
 			{_,Error} ->
-			    io:format("Warning! Tracing not started. Reason: ~p~n~n",
+			    io:format("Warning! Tracing not started. Reason: ~tp~n~n",
 				      [Error]),
 			    false
 		    end;
diff --git a/lib/common_test/src/ct_ssh.erl b/lib/common_test/src/ct_ssh.erl
index c4c969f4e4..ca62357e1c 100644
--- a/lib/common_test/src/ct_ssh.erl
+++ b/lib/common_test/src/ct_ssh.erl
@@ -161,7 +161,7 @@ connect(KeyOrName, ExtraOpts) when is_list(ExtraOpts) ->
 connect(KeyOrName, ConnType, ExtraOpts) ->
     case ct:get_config(KeyOrName) of
 	undefined ->
-	    log(heading(connect,KeyOrName), "Failed: ~p\n",
+	    log(heading(connect,KeyOrName), "Failed: ~tp\n",
 		[{not_available,KeyOrName}]),
 	    {error,{not_available,KeyOrName}};
 	SSHData ->
@@ -214,18 +214,18 @@ connect(KeyOrName, ConnType, ExtraOpts) ->
 		end,
 	    case {Addr,proplists:get_value(port, AllOpts1)} of
 		{undefined,_} ->
-		    log(heading(connect,KeyOrName), "Failed: ~p\n",
+		    log(heading(connect,KeyOrName), "Failed: ~tp\n",
 			[{not_available,{KeyOrName,ConnType1}}]),
 		    {error,{not_available,{KeyOrName,ConnType1}}};
 		{_,undefined} ->
 		    try_log(heading(connect,KeyOrName), 
-			    "Opening ~w connection to ~p:22\n",
+			    "Opening ~w connection to ~tp:22\n",
 			    [ConnType1,Addr]),
 		    ct_gen_conn:start(KeyOrName, {ConnType1,Addr,22}, 
 				      AllOpts1, ?MODULE);		    
 		{_,Port} ->
 		    try_log(heading(connect,KeyOrName), 
-			    "Opening ~w connection to ~p:~w\n",
+			    "Opening ~w connection to ~tp:~w\n",
 			    [ConnType1,Addr,Port]),
 		    ct_gen_conn:start(KeyOrName, {ConnType1,Addr,Port}, 
 				      AllOpts1, ?MODULE)
@@ -995,7 +995,7 @@ init(KeyOrName, {ConnType,Addr,Port}, AllOpts) ->
 	    SSHRef = element(2, Ok),
 	    try_log(heading(init,KeyOrName), 
 		    "Opened ~w connection:\n"
-		    "Host: ~p (~p)\nUser: ~p\nPassword: ~p\n",
+		    "Host: ~tp (~p)\nUser: ~tp\nPassword: ~p\n",
 		[ConnType,Addr,Port,User,lists:duplicate(length(Password),$*)]),
 	    {ok,SSHRef,#state{ssh_ref=SSHRef, conn_type=ConnType,
 			      target=KeyOrName}}
@@ -1033,11 +1033,11 @@ handle_msg({exec,Chn,Command,TO}, State) ->
 	end,
     case Chn1 of
 	{error,_} = ChnError ->
-	    log(heading(exec,Target), "Opening channel failed: ~p", [ChnError]),
+	    log(heading(exec,Target), "Opening channel failed: ~tp", [ChnError]),
 	    {ChnError,State};
 	_ ->
 	    try_log(heading(exec,Target), 
-		    "SSH Ref: ~p, Chn: ~p, Command: ~p, Timeout: ~p", 
+		    "SSH Ref: ~p, Chn: ~p, Command: ~tp, Timeout: ~p",
 		    [SSHRef,Chn1,Command,TO]),
 	    case ssh_connection:exec(SSHRef, Chn1, Command, TO) of
 		success ->
@@ -1060,7 +1060,7 @@ handle_msg({send,Chn,Type,Data,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
     try_log(heading(send,Target), 
 	    "SSH Ref: ~p, Chn: ~p, Type: ~p, Timeout: ~p~n"
-	    "Data: ~p", [SSHRef,Chn,Type,TO,Data]),
+	    "Data: ~tp", [SSHRef,Chn,Type,TO,Data]),
     Result = ssh_connection:send(SSHRef, Chn, Type, Data, TO),
     {Result,State};
 
@@ -1068,7 +1068,7 @@ handle_msg({send_and_receive,Chn,Type,Data,End,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,   
     try_log(heading(send_and_receive,Target), 
 	    "SSH Ref: ~p, Chn: ~p, Type: ~p, Timeout: ~p~n"
-	    "Data: ~p", [SSHRef,Chn,Type,TO,Data]),
+	    "Data: ~tp", [SSHRef,Chn,Type,TO,Data]),
     case ssh_connection:send(SSHRef, Chn, Type, Data, TO) of
 	ok ->
 	    Result = do_recv_response(SSHRef, Chn, [], End, TO),
@@ -1080,7 +1080,7 @@ handle_msg({send_and_receive,Chn,Type,Data,End,TO}, State) ->
 handle_msg({subsystem,Chn,Subsystem,TO}, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
     try_log(heading(subsystem,Target), 
-	    "SSH Ref: ~p, Chn: ~p, Subsys: ~p, Timeout: ~p", 
+	    "SSH Ref: ~p, Chn: ~p, Subsys: ~tp, Timeout: ~p",
 	    [SSHRef,Chn,Subsystem,TO]),
     Result = ssh_connection:subsystem(SSHRef, Chn, Subsystem, TO),
     {Result,State};
@@ -1097,151 +1097,151 @@ handle_msg({shell,Chn,TO}, State) ->
 
 handle_msg({read_file,Srv,File}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_file(ref(Srv,SSHRef), File),S};
 
 handle_msg({write_file,Srv,File,Iolist}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:write_file(ref(Srv,SSHRef), File, Iolist),S};
 
 handle_msg({list_dir,Srv,Path}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:list_dir(ref(Srv,SSHRef), Path),S};
 
 handle_msg({open,Srv,File,Mode}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:open(ref(Srv,SSHRef), File, Mode),S};
 
 handle_msg({opendir,Srv,Path}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:opendir(ref(Srv,SSHRef), Path),S};
 
 handle_msg({close,Srv,Handle}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:close(ref(Srv,SSHRef), Handle),S};
 
 handle_msg({read,Srv,Handle,Len}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read(ref(Srv,SSHRef), Handle, Len),S};
 
 handle_msg({pread,Srv,Handle,Position,Length}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:pread(ref(Srv,SSHRef),Handle,Position,Length),S};
 
 handle_msg({aread,Srv,Handle,Len}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:aread(ref(Srv,SSHRef), Handle, Len),S};
 
 handle_msg({apread,Srv,Handle,Position,Length}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:apread(ref(Srv,SSHRef), Handle, Position, Length),S};
 
 handle_msg({write,Srv,Handle,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:write(ref(Srv,SSHRef), Handle, Data),S};
 
 handle_msg({pwrite,Srv,Handle,Position,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:pwrite(ref(Srv,SSHRef), Handle, Position, Data),S};
 
 handle_msg({awrite,Srv,Handle,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:awrite(ref(Srv,SSHRef), Handle, Data),S};
 
 handle_msg({apwrite,Srv,Handle,Position,Data}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:apwrite(ref(Srv,SSHRef), Handle, Position, Data),S};
 
 handle_msg({position,Srv,Handle,Location}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:position(ref(Srv,SSHRef), Handle, Location),S};
 
 handle_msg({read_file_info,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_file_info(ref(Srv,SSHRef), Name),S};
 
 handle_msg({get_file_info,Srv,Handle}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:get_file_info(ref(Srv,SSHRef), Handle),S};
 
 handle_msg({read_link_info,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_link_info(ref(Srv,SSHRef), Name),S};
 
 handle_msg({write_file_info,Srv,Name,Info}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:write_file_info(ref(Srv,SSHRef), Name, Info),S};
 
 handle_msg({read_link,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:read_link(ref(Srv,SSHRef), Name),S};
 
 handle_msg({make_symlink,Srv,Name,Target}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:make_symlink(ref(Srv,SSHRef), Name, Target),S};
 
 handle_msg({rename,Srv,OldName,NewName}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:rename(ref(Srv,SSHRef), OldName, NewName),S};
 
 handle_msg({delete,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:delete(ref(Srv,SSHRef), Name),S};
 
 handle_msg({make_dir,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:make_dir(ref(Srv,SSHRef), Name),S};
 
 handle_msg({del_dir,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
     try_log(heading(sftp,S#state.target), 
-	    "SSH Ref: ~p, Server: ~p~nCmd: ~p",
+	    "SSH Ref: ~p, Server: ~p~nCmd: ~tp",
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:del_dir(ref(Srv,SSHRef), Name),S}.
 
@@ -1285,7 +1285,7 @@ do_recv_response(SSH, Chn, Data, End, Timeout) ->
 
 	{ssh_cm, SSH, {data,Chn,_,NewData}} ->
 	    ssh_connection:adjust_window(SSH, Chn, size(NewData)),
-	    debug("RECVD~n~p", [binary_to_list(NewData)]),
+	    debug("RECVD~n~tp", [binary_to_list(NewData)]),
 	    DataAcc = Data ++ binary_to_list(NewData),
 	    if is_function(End) ->
 		    case End(DataAcc) of
@@ -1338,7 +1338,7 @@ do_recv_response(SSH, Chn, Data, End, Timeout) ->
 	%%	    {ok,WCh};
 
 	Other ->
-	    debug("UNEXPECTED MESSAGE~n~p ~p~n~p", [SSH,Chn,Other]),
+	    debug("UNEXPECTED MESSAGE~n~p ~p~n~tp", [SSH,Chn,Other]),
 	    do_recv_response(SSH, Chn, Data, End, Timeout)
 
     after Timeout ->
@@ -1391,7 +1391,7 @@ mod(Cmd) ->
 %%%-----------------------------------------------------------------
 %%% 	  
 heading(Function, Ref) ->
-    io_lib:format("ct_ssh:~w ~p",[Function,Ref]).
+    io_lib:format("ct_ssh:~tw ~tp",[Function,Ref]).
 
 %%%-----------------------------------------------------------------
 %%% 
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index bff1112ab9..0374d1ffc6 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -251,7 +251,7 @@ open(KeyOrName,ConnType,TargetMod) ->
 open(KeyOrName,ConnType,TargetMod,Extra) ->
     case ct:get_config({KeyOrName,ConnType}) of
 	undefined ->
-	    log(undefined,open,"Failed: ~p",[{not_available,KeyOrName}]),
+	    log(undefined,open,"Failed: ~tp",[{not_available,KeyOrName}]),
 	    {error,{not_available,KeyOrName,ConnType}};
 	Addr ->
 	    Addr1 =
@@ -273,7 +273,7 @@ open(KeyOrName,ConnType,TargetMod,Extra) ->
 			end;
 		    Bool -> Bool
 		end,
-	    log(undefined,open,"Connecting to ~p(~p)",
+	    log(undefined,open,"Connecting to ~tp(~tp)",
 		[KeyOrName,Addr1]),
 	    Reconnect =
 		case ct:get_config({telnet_settings,reconnection_attempts}) of
@@ -672,7 +672,7 @@ set_telnet_defaults([{tcp_nodelay,NoDelay}|Ss],S) ->
     set_telnet_defaults(Ss,S#state{tcp_nodelay=NoDelay});
 set_telnet_defaults([Unknown|Ss],S) ->
     force_log(S,error,
-	      "Bad element in telnet_settings: ~p",[Unknown]),
+	      "Bad element in telnet_settings: ~tp",[Unknown]),
     set_telnet_defaults(Ss,S);
 set_telnet_defaults([],S) ->
     S.
@@ -680,7 +680,7 @@ set_telnet_defaults([],S) ->
 %% @hidden
 handle_msg({cmd,Cmd,Opts},State) ->
     start_gen_log(heading(cmd,State#state.name)),
-    log(State,cmd,"Cmd: ~p",[Cmd]),
+    log(State,cmd,"Cmd: ~tp",[Cmd]),
 
     %% whatever is in the buffer from previous operations
     %% will be ignored as we go ahead with this telnet cmd
@@ -715,7 +715,7 @@ handle_msg({cmd,Cmd,Opts},State) ->
 	case teln_cmd(State#state.teln_pid, Cmd, State#state.prx,
 		      Newline, TO) of
 	    {ok,Data,_PromptType,Rest} ->
-		log(State,recv,"Return: ~p",[{ok,Data}]),
+		log(State,recv,"Return: ~tp",[{ok,Data}]),
 		{{ok,Data},Rest,true};
 	    Error ->
 		Retry = {retry,{Error,
@@ -723,14 +723,14 @@ handle_msg({cmd,Cmd,Opts},State) ->
 				 State#state.type},
 				State#state.teln_pid,
 				{cmd,Cmd,Opts}}},
-		log(State,recv,"Return: ~p",[Error]),
+		log(State,recv,"Return: ~tp",[Error]),
 		{Retry,[],false}
 	end,
     end_gen_log(),
     {Return,State#state{buffer=NewBuffer,prompt=Prompt}};
 handle_msg({send,Cmd,Opts},State) ->
     start_gen_log(heading(send,State#state.name)),
-    log(State,send,"Sending: ~p",[Cmd]),
+    log(State,send,"Sending: ~tp",[Cmd]),
     
     debug_cont_gen_log("Throwing Buffer:",[]),
     debug_log_lines(State#state.buffer),
@@ -762,12 +762,12 @@ handle_msg(get_data,State) ->
     log(State,cmd,"Reading data...",[]),
     {ok,Data,Buffer} = teln_get_all_data(State,State#state.buffer,[],[],
 					 State#state.poll_limit),
-    log(State,recv,"Return: ~p",[{ok,Data}]),
+    log(State,recv,"Return: ~tp",[{ok,Data}]),
     end_gen_log(),
     {{ok,Data},State#state{buffer=Buffer}};
 handle_msg({expect,Pattern,Opts},State) ->
     start_gen_log(heading(expect,State#state.name)),
-    log(State,expect,"Expect: ~p\nOpts = ~p\n",[Pattern,Opts]),
+    log(State,expect,"Expect: ~tp\nOpts = ~tp\n",[Pattern,Opts]),
     {Return,NewBuffer,Prompt} = 
 	case teln_expect(State#state.name,
 			 State#state.teln_pid,
@@ -779,15 +779,15 @@ handle_msg({expect,Pattern,Opts},State) ->
 		P = check_if_prompt_was_reached(Data,[]),
 		{{ok,Data},Rest,P};
 	    {ok,Data,HaltReason,Rest} ->
-		force_log(State,expect,"HaltReason: ~p",[HaltReason]),
+		force_log(State,expect,"HaltReason: ~tp",[HaltReason]),
 		P = check_if_prompt_was_reached(Data,HaltReason),
 		{{ok,Data,HaltReason},Rest,P};
 	    {error,Reason,Rest} ->
-		force_log(State,expect,"Expect failed\n~p",[{error,Reason}]),
+		force_log(State,expect,"Expect failed\n~tp",[{error,Reason}]),
 		P = check_if_prompt_was_reached([],Reason),
 		{{error,Reason},Rest,P};
 	    {error,Reason} ->
-		force_log(State,expect,"Expect failed\n~p",[{error,Reason}]),
+		force_log(State,expect,"Expect failed\n~tp",[{error,Reason}]),
 		P = check_if_prompt_was_reached([],Reason),
 		{{error,Reason},[],P}
 	end,
@@ -896,7 +896,7 @@ check_if_prompt_was_reached(_,_) ->
 heading(Action,undefined) ->
     io_lib:format("~w ~w",[?MODULE,Action]);
 heading(Action,Name) ->
-    io_lib:format("~w ~w for ~p",[?MODULE,Action,Name]).
+    io_lib:format("~w ~w for ~tp",[?MODULE,Action,Name]).
 
 force_log(State,Action,String,Args) ->
     log(State,Action,String,Args,true).
@@ -1294,7 +1294,7 @@ get_data1(Pid) ->
 
 %% one_expect: split data chunk at prompts
 one_expect(Name,Pid,Data,Pattern,EO) when EO#eo.prompt_check==false ->
-%    io:format("Raw Data ~p Pattern ~p EO ~p ",[Data,Pattern,EO]),
+%    io:format("Raw Data ~tp Pattern ~tp EO ~tp ",[Data,Pattern,EO]),
     one_expect1(Name,Pid,Data,Pattern,[],EO#eo{found_prompt=false});
 one_expect(Name,Pid,Data,Pattern,EO) ->
     case match_prompt(Data,EO#eo.prx) of
diff --git a/lib/common_test/src/ct_telnet_client.erl b/lib/common_test/src/ct_telnet_client.erl
index 5df7e279ac..4463bdf350 100644
--- a/lib/common_test/src/ct_telnet_client.erl
+++ b/lib/common_test/src/ct_telnet_client.erl
@@ -120,7 +120,7 @@ get_data(Pid) ->
 init(Parent, Server, Port, Timeout, KeepAlive, NoDelay, ConnName) ->
     case gen_tcp:connect(Server, Port, [list,{packet,0},{nodelay,NoDelay}], Timeout) of
 	{ok,Sock} ->
-	    dbg("~p connected to: ~p (port: ~w, keep_alive: ~w)\n",
+	    dbg("~tp connected to: ~tp (port: ~w, keep_alive: ~w)\n",
 		[ConnName,Server,Port,KeepAlive]),
 	    send([?IAC,?DO,?SUPPRESS_GO_AHEAD], Sock, ConnName),	      
 	    Parent ! {open,self()},
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 180786273d..09839bd35d 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -344,7 +344,7 @@ create_spec_tree([Spec|Specs],TS,JoinWithNext,Known) ->
 		     create_spec_tree(Specs,TS,JoinWithNext,Known)};	
 		{error,Reason} ->
 		    ReasonStr =
-			lists:flatten(io_lib:format("~s",
+			lists:flatten(io_lib:format("~ts",
 						    [file:format_error(Reason)])),
 		    throw({error,{SpecAbsName,ReasonStr}})
 	    end
@@ -1101,7 +1101,7 @@ check_term(Term) when is_tuple(Term) ->
 				true ->
 				    io:format("~nSuspicious term, "
 					      "please check:~n"
-					      "~p~n", [Term]),
+					      "~tp~n", [Term]),
 				    invalid;
 				false ->
 				    invalid
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 72c41da8ca..abf131f4df 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -207,7 +207,7 @@ do_start(Parent, Mode, LogDir, Verbosity) ->
     catch
 	_:CTHReason ->
 	    ErrorInfo = if is_atom(CTHReason) ->
-				io_lib:format("{~p,~p}",
+				io_lib:format("{~tp,~tp}",
 					      [CTHReason,
 					       erlang:get_stacktrace()]);
 			   true ->
@@ -490,7 +490,7 @@ loop(Mode,TestData,StartDir) ->
 					 ?MAX_IMPORTANCE,
 					 "CT Error Notification",
 					 "Connection process died: "
-					 "Pid: ~w, Address: ~p, "
+					 "Pid: ~w, Address: ~tp, "
 					 "Callback: ~w\n"
 					 "Reason: ~ts\n\n",
 					 [Pid,A,CB,ErrorHtml]),
@@ -501,7 +501,7 @@ loop(Mode,TestData,StartDir) ->
 		_ ->
 		    %% Let process crash in case of error, this shouldn't happen!
 		    io:format("\n\nct_util_server got EXIT "
-			      "from ~w: ~p\n\n", [Pid,Reason]),
+			      "from ~w: ~tp\n\n", [Pid,Reason]),
 		    ok = file:set_cwd(StartDir),
 		    exit(Reason)
 	    end
@@ -977,12 +977,12 @@ get_profile_data(Profile, Key, StartDir) ->
 	end,
     case Result of
 	{error,enoent} when Profile /= default ->
-	    io:format(?def_gl, "~nERROR! Missing profile file ~p~n", [File]),
+	    io:format(?def_gl, "~nERROR! Missing profile file ~tp~n", [File]),
 	    undefined;
 	{error,enoent} when Profile == default ->
 	    undefined;
 	{error,Reason} ->
-	    io:format(?def_gl,"~nERROR! Error in profile file ~p: ~p~n",
+	    io:format(?def_gl,"~nERROR! Error in profile file ~tp: ~tp~n",
 		      [WhichFile,Reason]),
 	    undefined;
 	{ok,Data} ->
@@ -993,7 +993,7 @@ get_profile_data(Profile, Key, StartDir) ->
 			    Data;
 			_ ->
 			    io:format(?def_gl,
-				      "~nERROR! Invalid profile data in ~p~n",
+				      "~nERROR! Invalid profile data in ~tp~n",
 				      [WhichFile]),
 			    []
 		    end,
diff --git a/lib/common_test/src/ct_webtool.erl b/lib/common_test/src/ct_webtool.erl
index 87af442fd3..5448022937 100644
--- a/lib/common_test/src/ct_webtool.erl
+++ b/lib/common_test/src/ct_webtool.erl
@@ -120,10 +120,10 @@ debug_app(Mod) ->
    
 out(_,{trace_ts,Pid,call,MFA={M,F,A},{W,_,_},TS},_,S) 
   when W==webtool;W==mod_esi-> 
-    io:format("~w: (~p)~ncall ~s~n", [TS,Pid,ffunc(MFA)]),
+    io:format("~w: (~p)~ncall ~ts~n", [TS,Pid,ffunc(MFA)]),
     [{M,F,length(A)}|S];
 out(_,{trace_ts,Pid,return_from,MFA,R,TS},_,[MFA|S]) ->
-    io:format("~w: (~p)~nreturned from ~s -> ~p~n", [TS,Pid,ffunc(MFA),R]),
+    io:format("~w: (~p)~nreturned from ~ts -> ~tp~n", [TS,Pid,ffunc(MFA),R]),
     S;
 out(_,_,_,_) ->
     ok.
@@ -171,7 +171,7 @@ script_start([App,Browser]) ->
 		    IExplore=filename:join(win32reg:expand(Val),"iexplore.exe"),
                     os:cmd("\"" ++ IExplore ++ "\" " ++ Url);
 		_ when OSType == win32 ->
-                    io:format("Starting ~w...\n",[Browser]),
+                    io:format("Starting ~tw...\n",[Browser]),
                     os:cmd("\"" ++ atom_to_list(Browser) ++ "\" " ++ Url);
 		B when B==firefox; B==mozilla ->
 		    io:format("Sending URL to ~w...",[Browser]),
@@ -194,7 +194,7 @@ script_start([App,Browser]) ->
 			    os:cmd(BStr ++ " " ++ Url)
 		    end;
 		_ ->
-		    io:format("Starting ~w...\n",[Browser]),
+		    io:format("Starting ~tw...\n",[Browser]),
 		    os:cmd(atom_to_list(Browser) ++ " " ++ Url)
 	    end,
 	    ok;
@@ -379,7 +379,7 @@ print_url(ConfigData)->
     Server=proplists:get_value(server_name,ConfigData,"undefined"),
     Port=proplists:get_value(port,ConfigData,"undefined"),
     {A,B,C,D}=proplists:get_value(bind_address,ConfigData,"undefined"),
-    io:format("WebTool is available at http://~s:~w/~n",[Server,Port]),
+    io:format("WebTool is available at http://~ts:~w/~n",[Server,Port]),
     io:format("Or  http://~w.~w.~w.~w:~w/~n",[A,B,C,D,Port]).
 
 
@@ -859,8 +859,8 @@ handle_app({Name,{start,{func,Start,Stop}}},Data,_Pid,Cmd)->
 		    %%! Here the tool disappears from the webtool interface!!
 		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
 			      "Could not start application \'~p\'\n\n"
-			      "~w:~w(~s) ->\n"
-			      "~p\n\n",
+			      "~w:~tw(~ts) ->\n"
+			      "~tp\n\n",
 			      [?LINE,Name,M,F,format_args(A),Exit]),
 		    ets:delete(Data,Name);
 		_OK->
@@ -883,16 +883,16 @@ handle_app({Name,{start,{child,ChildSpec}}},Data,Pid,Cmd)->
 		    %%! Here the tool disappears from the webtool interface!!
 		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
 			      "Could not start application \'~p\'\n\n"
-			      "supervisor:start_child(~p,~p) ->\n"
-			      "~p\n\n",
+			      "supervisor:start_child(~p,~tp) ->\n"
+			      "~tp\n\n",
 			      [?LINE,Name,Pid,ChildSpec,{error,Reason}]),
 		    ets:delete(Data,Name);
 		Error ->
 		    %%! Here the tool disappears from the webtool interface!!
 		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
 			      "Could not start application \'~p\'\n\n"
-			      "supervisor:start_child(~p,~p) ->\n"
-			      "~p\n\n",
+			      "supervisor:start_child(~p,~tp) ->\n"
+			      "~tp\n\n",
 			      [?LINE,Name,Pid,ChildSpec,Error]),
 		    ets:delete(Data,Name)
 	    end;
@@ -924,7 +924,7 @@ handle_app({Name,{start,{app,Real_name}}},Data,_Pid,Cmd)->
 		    io:format("\n=======ERROR (webtool, line ~w) =======\n"
 			      "Could not start application \'~p\'\n\n"
 			      "application:start(~p,~p) ->\n"
-			      "~p\n\n",
+			      "~tp\n\n",
 			      [?LINE,Name,Real_name,temporary,Error]),
 		    ets:delete(Data,Name)
 	    end;
@@ -940,7 +940,7 @@ handle_app({Name,Incorrect},Data,_Pid,Cmd)->
     %%! Here the tool disappears from the webtool interface!!
     io:format("\n=======ERROR (webtool, line ~w) =======\n"
 	      "Could not ~w application \'~p\'\n\n"
-	      "Incorrect data: ~p\n\n",
+	      "Incorrect data: ~tp\n\n",
 	      [?LINE,Cmd,Name,Incorrect]),
     ets:delete(Data,Name).
 
@@ -1202,12 +1202,12 @@ filter_tool_files(Dir,[File|Rest]) ->
 %%%-----------------------------------------------------------------
 %%% format functions
 ffunc({M,F,A}) when is_list(A) ->
-    io_lib:format("~w:~w(~s)\n",[M,F,format_args(A)]);
+    io_lib:format("~w:~tw(~ts)\n",[M,F,format_args(A)]);
 ffunc({M,F,A}) when is_integer(A) ->
-    io_lib:format("~w:~w/~w\n",[M,F,A]).
+    io_lib:format("~w:~tw/~w\n",[M,F,A]).
 
 format_args([]) ->
     "";
 format_args(Args) ->
-    Str = lists:append(["~p"|lists:duplicate(length(Args)-1,",~p")]),
+    Str = lists:append(["~tp"|lists:duplicate(length(Args)-1,",~tp")]),
     io_lib:format(Str,Args).
diff --git a/lib/common_test/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl
index faff150ac9..7b6f03311a 100644
--- a/lib/common_test/src/cth_conn_log.erl
+++ b/lib/common_test/src/cth_conn_log.erl
@@ -116,7 +116,7 @@ pre_init_per_testcase(_Suite,TestCase,Config,CthState) ->
 			      "<table borders=1>"
 			      "<b>" ++ ConnModStr ++ " logs:</b>\n" ++
 			      [io_lib:format(
-				 "<tr><td>~p</td><td><a href=\"~ts\">~ts</a>"
+				 "<tr><td>~tp</td><td><a href=\"~ts\">~ts</a>"
 				 "</td></tr>",
 				 [S,ct_logs:uri(L),filename:basename(L)])
 			       || {S,L} <- Ls] ++
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 1bc9b10d41..8b29d0f96d 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -250,26 +250,26 @@ format_header(#eh_state{curr_suite = Suite,
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = undefined,
 			curr_func = TcOrConf}) ->
-    io_lib:format("System report during ~w:~w/1",
+    io_lib:format("System report during ~w:~tw/1",
 		  [Suite,TcOrConf]);
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = Group,
 			curr_func = Conf}) when Conf == init_per_group;
 						Conf == end_per_group ->
-    io_lib:format("System report during ~w:~w/2 for ~w",
+    io_lib:format("System report during ~w:~w/2 for ~tw",
 		  [Suite,Conf,Group]);
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = Group,
 			parallel_tcs = true}) ->
-    io_lib:format("System report during ~w in ~w",
+    io_lib:format("System report during ~tw in ~w",
 		  [Group,Suite]);
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = Group,
 			curr_func = TC}) ->
-    io_lib:format("System report during ~w:~w/1 in ~w",
+    io_lib:format("System report during ~w:~tw/1 in ~tw",
 		  [Suite,TC,Group]).
 
 code_change(_OldVsn, State, _Extra) ->
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index 0bbb217275..da68bd105e 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -143,7 +143,7 @@ on_tc_fail(_Suite,_TC, Res, State) ->
     TC = hd(TCs),
     NewTC = TC#testcase{
 	      result =
-		  {fail,lists:flatten(io_lib:format("~p",[Res]))} },
+		  {fail,lists:flatten(io_lib:format("~tp",[Res]))} },
     State#state{ test_cases = [NewTC | tl(TCs)]}.
 
 on_tc_skip(Suite,{ConfigFunc,_GrName}, Res, State) ->
@@ -164,7 +164,7 @@ do_tc_skip(Res, State) ->
     TC = hd(TCs),
     NewTC = TC#testcase{
 	      result =
-		  {skipped,lists:flatten(io_lib:format("~p",[Res]))} },
+		  {skipped,lists:flatten(io_lib:format("~tp",[Res]))} },
     State#state{ test_cases = [NewTC | tl(TCs)]}.
 
 init_tc(State, Config) when is_list(Config) == false ->
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index a4a84393c1..ee3a5e4bba 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -175,7 +175,7 @@ do_cover_compile(Modules) ->
     ok.
 
 warn_compile({error,{Reason,Module}}) ->
-    io:fwrite("\nWARNING: Could not cover compile ~ts: ~p\n",
+    io:fwrite("\nWARNING: Could not cover compile ~ts: ~tp\n",
 	      [Module,{error,Reason}]).
 
 %% Make sure all modules are loaded and unstick if sticky
@@ -189,7 +189,7 @@ prepare_cover_compile([M|Ms],Sticky) ->
 		{module,_} ->
 		    prepare_cover_compile([M|Ms],Sticky);
 		Error ->
-		    io:fwrite("\nWARNING: Could not load ~w: ~p\n",[M,Error]),
+		    io:fwrite("\nWARNING: Could not load ~w: ~tp\n",[M,Error]),
 		    prepare_cover_compile(Ms,Sticky)
 	    end;
 	{false,_} ->
@@ -450,7 +450,7 @@ run_test_case_msgloop(#st{ref=Ref,pid=Pid,end_conf_pid=EndConfPid0}=St0) ->
 			 exit(Pid, kill),
 			 %% here's the only place we know Reason, so we save
 			 %% it as a comment, potentially replacing user data
-			 Error = lists:flatten(io_lib:format("Aborted: ~p",
+			 Error = lists:flatten(io_lib:format("Aborted: ~tp",
 							     [Reason])),
 			 Error1 = lists:flatten([string:strip(S,left) ||
 						    S <- string:tokens(Error,
@@ -756,13 +756,13 @@ print_end_conf_result(Mod,Func,Conf,Cause,Error) ->
     Str2Print =
 	fun(NoHTML) when NoHTML == stdout; NoHTML == major ->
 		io_lib:format("WARNING! "
-			      "~w:end_per_testcase(~w, ~tp)"
+			      "~w:end_per_testcase(~tw, ~tp)"
 			      " ~s!\n\tReason: ~tp\n",
 			      [Mod,Func,Conf,Cause,Error]);		    
 	   (minor) ->
 		ErrorStr = test_server_ctrl:escape_chars(Error),
 		io_lib:format("WARNING! "
-			      "~w:end_per_testcase(~w, ~tp)"
+			      "~w:end_per_testcase(~tw, ~tp)"
 			      " ~s!\n\tReason: ~ts\n",
 			      [Mod,Func,Conf,Cause,ErrorStr])
 	end,
@@ -792,7 +792,7 @@ spawn_fw_call(Mod,IPTC={init_per_testcase,Func},CurrConf,Pid,
 			   _                       -> died
 		       end,
 		group_leader() ! {printout,12,
-				  "ERROR! ~w:init_per_testcase(~w, ~p)"
+				  "ERROR! ~w:init_per_testcase(~tw, ~tp)"
 				  " failed!\n\tReason: ~tp\n",
 				 [Mod,Func,CurrConf,Why]},
 		%% finished, report back
@@ -820,7 +820,7 @@ spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
 			{timetrap_timeout,TVal} ->
 			    group_leader() !
 				{printout,12,
-				 "WARNING! ~w:end_per_testcase(~w, ~p)"
+				 "WARNING! ~w:end_per_testcase(~tw, ~tp)"
 				 " failed!\n\tReason: timetrap timeout"
 				 " after ~w ms!\n", [Mod,Func,EndConf,TVal]},
 			    W = "<font color=\"red\">"
@@ -829,7 +829,7 @@ spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
 			_ ->
 			    group_leader() !
 				{printout,12,
-				 "WARNING! ~w:end_per_testcase(~w, ~p)"
+				 "WARNING! ~w:end_per_testcase(~tw, ~tp)"
 				 " failed!\n\tReason: ~tp\n",
 				 [Mod,Func,EndConf,Why]},
 			    W = "<font color=\"red\">"
@@ -859,7 +859,7 @@ spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
 		Comment =
 		    lists:flatten(
 		      io_lib:format("<font color=\"red\">"
-				    "WARNING! ~w:~w failed!</font>",
+				    "WARNING! ~w:~tw failed!</font>",
 				    [FwMod,FwFunc])),
 	    %% finished, report back
 	    SendTo ! {self(),fw_notify_done,
@@ -1341,7 +1341,7 @@ print_init_conf_result(Line,Cause,Reason) ->
     Str2Print =
 	fun(NoHTML) when NoHTML == stdout; NoHTML == major ->
 		io_lib:format("ERROR! init_per_testcase ~s!\n"
-				      "\tLocation: ~p\n\tReason: ~tp\n",
+				      "\tLocation: ~tp\n\tReason: ~tp\n",
 				      [Cause,Line,Reason]);
 	   (minor) ->
 		ReasonStr = test_server_ctrl:escape_chars(Reason),
@@ -1413,7 +1413,7 @@ print_end_tc_warning(EndFunc,Reason,Cause,Loc) ->
     Str2Print =
 	fun(NoHTML) when NoHTML == stdout; NoHTML == major ->
 		io_lib:format("WARNING: ~w ~s!\n"
-			      "Reason: ~tp\nLine: ~p\n",
+			      "Reason: ~tp\nLine: ~tp\n",
 			      [EndFunc,Cause,Reason,Loc]);
 	   (minor) ->
 		ReasonStr = test_server_ctrl:escape_chars(Reason),
@@ -1515,7 +1515,7 @@ lookup_config(Key,Config) ->
 	{value,{Key,Val}} ->
 	    Val;
 	_ ->
-	    io:format("Could not find element ~p in Config.~n",[Key]),
+	    io:format("Could not find element ~tp in Config.~n",[Key]),
 	    undefined
     end.
 
@@ -1600,7 +1600,7 @@ format(Detail, Format, Args) ->
     Str =
 	case catch io_lib:format(Format,Args) of
 	    {'EXIT',_} ->
-		io_lib:format("illegal format; ~p with args ~p.\n",
+		io_lib:format("illegal format; ~tp with args ~tp.\n",
 			      [Format,Args]);
 	    Valid -> Valid
 	end,
@@ -1732,7 +1732,7 @@ fail(Reason) ->
 
 cast_to_list(X) when is_list(X) -> X;
 cast_to_list(X) when is_atom(X) -> atom_to_list(X);
-cast_to_list(X) -> lists:flatten(io_lib:format("~p", [X])).
+cast_to_list(X) -> lists:flatten(io_lib:format("~tp", [X])).
 
 
 
@@ -1904,7 +1904,7 @@ ensure_timetrap(Config) ->
 		Garbage ->
 		    erase(test_server_default_timetrap),
 		    format("=== WARNING: garbage in "
-			   "test_server_default_timetrap: ~p~n",
+			   "test_server_default_timetrap: ~tp~n",
 			   [Garbage])
 	    end,
 	    DTmo = case lists:keysearch(default_timeout,1,Config) of
@@ -1933,7 +1933,7 @@ cancel_default_timetrap(true) ->
 	Garbage ->
 	    erase(test_server_default_timetrap),
 	    format("=== WARNING: garbage in "
-		   "test_server_default_timetrap: ~p~n",
+		   "test_server_default_timetrap: ~tp~n",
 		   [Garbage]),
 	    error
     end.
@@ -1942,7 +1942,7 @@ time_ms({hours,N}, _, _) -> hours(N);
 time_ms({minutes,N}, _, _) -> minutes(N);
 time_ms({seconds,N}, _, _) -> seconds(N);
 time_ms({Other,_N}, _, _) ->
-    format("=== ERROR: Invalid time specification: ~p. "
+    format("=== ERROR: Invalid time specification: ~tp. "
 	   "Should be seconds, minutes, or hours.~n", [Other]),
     exit({invalid_time_format,Other});
 time_ms(Ms, _, _) when is_integer(Ms) -> Ms;
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 064e375cd5..9412c43187 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -232,7 +232,7 @@ parse_cmd_line(['SPEC',Spec|Cmds], SpecList, Names, Param, Trc, Cov, TCCB) ->
 	    parse_cmd_line(Cmds, TermList++SpecList, [Name|Names], Param,
 			   Trc, Cov, TCCB);
 	{error,Reason} ->
-	    io:format("Can't open ~w: ~p\n",[Spec, file:format_error(Reason)]),
+	    io:format("Can't open ~tw: ~tp\n",[Spec, file:format_error(Reason)]),
 	    parse_cmd_line(Cmds, SpecList, Names, Param, Trc, Cov, TCCB)
     end;
 parse_cmd_line(['NAME',Name|Cmds], SpecList, Names, Param, Trc, Cov, TCCB) ->
@@ -261,7 +261,7 @@ parse_cmd_line(['COVER',App,CF,Analyse|Cmds], SpecList, Names, Param, Trc, _Cov,
 parse_cmd_line(['TESTCASE_CALLBACK',Mod,Func|Cmds], SpecList, Names, Param, Trc, Cov, _) ->
     parse_cmd_line(Cmds, SpecList, Names, Param, Trc, Cov, {Mod,Func});
 parse_cmd_line([Obj|_Cmds], _SpecList, _Names, _Param, _Trc, _Cov, _TCCB) ->
-    io:format("~w: Bad argument: ~w\n", [?MODULE,Obj]),
+    io:format("~w: Bad argument: ~tw\n", [?MODULE,Obj]),
     io:format(" Use the `ts' module to start tests.\n", []),
     io:format(" (If you ARE using `ts', there is a bug in `ts'.)\n", []),
     halt(1);
@@ -280,7 +280,7 @@ parse_cmd_line([], SpecList, Names, Param, Trc, Cov, TCCB) ->
 
 cast_to_list(X) when is_list(X) -> X;
 cast_to_list(X) when is_atom(X) -> atom_to_list(X);
-cast_to_list(X) -> lists:flatten(io_lib:format("~w", [X])).
+cast_to_list(X) -> lists:flatten(io_lib:format("~tw", [X])).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% START INTERFACE
@@ -878,7 +878,7 @@ handle_call({testcase_callback,ModFunc}, _From, State) ->
 		    ok;
 		false ->
 		    io:format(user,
-			      "WARNING! Callback function ~w:~w/4 undefined.~n~n",
+			      "WARNING! Callback function ~w:~tw/4 undefined.~n~n",
 			      [Mod,Func])
 	    end;
 	_ ->
@@ -1016,7 +1016,7 @@ handle_info({'EXIT',Pid,Reason}, State) ->
 		killed ->
 		    io:format("Suite ~ts was killed\n", [Name]);
 		_Other ->
-		    io:format("Suite ~ts was killed with reason ~p\n",
+		    io:format("Suite ~ts was killed with reason ~tp\n",
 			      [Name,Reason])
 	    end,
 	    State2 = State#state{jobs=NewJobs},
@@ -1168,10 +1168,10 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
 	{'EXIT',test_suites_done} ->
 	    ok;
 	{'EXIT',_Pid,Reason} ->
-	    print(1, "EXIT, reason ~p", [Reason]);
+	    print(1, "EXIT, reason ~tp", [Reason]);
 	{'EXIT',Reason} ->
 	    report_severe_error(Reason),
-	    print(1, "EXIT, reason ~p", [Reason])
+	    print(1, "EXIT, reason ~tp", [Reason])
     end,
     Time = TimeMy/1000000,
     SuccessStr =
@@ -1263,7 +1263,7 @@ do_spec(SpecName, TimetrapSpec) when is_list(SpecName) ->
 	{ok,TermList} ->
 	    do_spec_list(TermList,TimetrapSpec);
 	{error,Reason} ->
-	    io:format("Can't open ~ts: ~p\n", [SpecName,Reason]),
+	    io:format("Can't open ~ts: ~tp\n", [SpecName,Reason]),
 	    {error,{cant_open_spec,Reason}}
     end.
 
@@ -1346,7 +1346,7 @@ do_spec_terms([{require_nodenames,NumNames}|Terms], TopCases, SkipList, Config)
     do_spec_terms(Terms, TopCases, SkipList,
 		  update_config(Config, {nodenames,NodeNames}));
 do_spec_terms([Other|Terms], TopCases, SkipList, Config) ->
-    io:format("** WARNING: Spec file contains unknown directive ~p\n",
+    io:format("** WARNING: Spec file contains unknown directive ~tp\n",
 	      [Other]),
     do_spec_terms(Terms, TopCases, SkipList, Config).
 
@@ -1503,7 +1503,7 @@ do_test_cases(TopCases, SkipCases,
     FwMod = get_fw_mod(?MODULE),
     case collect_all_cases(TopCases, SkipCases) of
 	{error,Why} ->
-	    print(1, "Error starting: ~p", [Why]),
+	    print(1, "Error starting: ~tp", [Why]),
 	    exit(test_suites_done);
 	TestSpec0 ->
 	    N = case remove_conf(TestSpec0) of
@@ -1762,18 +1762,14 @@ make_html_link(LinkName, Target, Explanation) ->
 start_minor_log_file(Mod, Func, ParallelTC) ->
     MFA = {Mod,Func,1},
     LogDir = get(test_server_log_dir_base),
-    Name0 = lists:flatten(io_lib:format("~w.~w~ts", [Mod,Func,?html_ext])),
-    Name = downcase(Name0),
+    Name = minor_log_file_name(Mod,Func),
     AbsName = filename:join(LogDir, Name),
     case (ParallelTC orelse (element(1,file:read_file_info(AbsName))==ok)) of
 	false ->                           %% normal case, unique name
 	    start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA);
 	true ->                            %% special case, duplicate names
 	    Tag = test_server_sup:unique_name(),
-	    Name1_0 =
-		lists:flatten(io_lib:format("~w.~w.~ts~ts", [Mod,Func,Tag,
-							      ?html_ext])),
-	    Name1 = downcase(Name1_0),
+            Name1 = minor_log_file_name(Mod,Func,[$.|Tag]),
 	    AbsName1 = filename:join(LogDir, Name1),
 	    start_minor_log_file1(Mod, Func, LogDir, AbsName1, MFA)
     end.
@@ -1784,7 +1780,7 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA) ->
     put(test_server_minor_fd, Fd),
     test_server_gl:set_minor_fd(group_leader(), Fd, MFA),
 
-    TestDescr = io_lib:format("Test ~w:~w result", [Mod,Func]),
+    TestDescr = io_lib:format("Test ~w:~tw result", [Mod,Func]),
     {Header,Footer} =
 	case test_server_sup:framework_call(get_html_wrapper,
 					    [TestDescr,false,
@@ -1825,13 +1821,13 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA) ->
 		  lists:member(no_src, get(test_server_logopts))} of
 		{true,false} ->
 		    print(Lev, ["$tc_html",
-				Info ++ "<a href=\"~ts#~ts\">~w:~w/~w</a> "
+				Info ++ "<a href=\"~ts#~ts\">~w:~tw/~w</a> "
 				"(click for source code)\n"],
 			  [uri_encode(SrcListing),
 			   uri_encode(atom_to_list(Func)++"-1",utf8),
 			   Mod,Func,Arity]);
 		_ ->
-		    print(Lev, ["$tc_html",Info ++ "~w:~w/~w\n"], [Mod,Func,Arity])
+		    print(Lev, ["$tc_html",Info ++ "~w:~tw/~w\n"], [Mod,Func,Arity])
 	    end
     end,
 
@@ -1845,6 +1841,19 @@ stop_minor_log_file() ->
     ok = file:close(Fd),
     put(test_server_minor_fd, undefined).
 
+minor_log_file_name(Mod,Func) ->
+    minor_log_file_name(Mod,Func,"").
+minor_log_file_name(Mod,Func,Tag) ->
+    Name =
+        downcase(
+          lists:flatten(
+            io_lib:format("~w.~tw~s~s", [Mod,Func,Tag,?html_ext]))),
+    Ok = file:native_name_encoding()==utf8
+        orelse io_lib:printable_latin1_list(Name),
+    if Ok -> Name;
+       true -> exit({error,unicode_name_on_latin1_file_system})
+    end.
+
 downcase(S) -> downcase(S, []).
 downcase([Uc|Rest], Result) when $A =< Uc, Uc =< $Z ->
     downcase(Rest, [Uc-$A+$a|Result]);
@@ -2736,7 +2745,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 					TimetrapData, Mode, Status2);
 		Bad ->
 		    print(minor,
-			  "~n*** ~w returned bad elements in Config: ~p.~n",
+			  "~n*** ~tw returned bad elements in Config: ~tp.~n",
 			  [Func,Bad]),
 		    Reason = {failed,{Mod,init_per_suite,bad_return}},
 		    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode,
@@ -2752,9 +2761,9 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    stop_minor_log_file(),
 	    run_test_cases_loop(Cases, [NewCfg|Config], TimetrapData, Mode, Status2);
 	{_,{framework_error,{FwMod,FwFunc},Reason},_} ->
-	    print(minor, "~n*** ~w failed in ~w. Reason: ~p~n",
+	    print(minor, "~n*** ~w failed in ~tw. Reason: ~tp~n",
 		  [FwMod,FwFunc,Reason]),
-	    print(1, "~w failed in ~w. Reason: ~p~n", [FwMod,FwFunc,Reason]),
+	    print(1, "~w failed in ~tw. Reason: ~tp~n", [FwMod,FwFunc,Reason]),
 	    exit(framework_error);
 	{_,Fail,_} when element(1,Fail) == 'EXIT';
 			element(1,Fail) == timetrap_timeout;
@@ -2763,7 +2772,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    {Cases2,Config1,Status3} =
 		if StartConf ->
 			ReportAbortRepeat(failed),
-			print(minor, "~n*** ~w failed.~n"
+			print(minor, "~n*** ~tw failed.~n"
 			      "    Skipping all cases.", [Func]),
 			Reason = {failed,{Mod,Func,Fail}},
 			{skip_cases_upto(Ref, Cases, Reason, conf, CurrMode,
@@ -2786,7 +2795,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    {Cases2,Config1,Status3} =
 		if StartConf ->
 			ReportAbortRepeat(auto_skipped),
-			print(minor, "~n*** ~w auto skipped.~n"
+			print(minor, "~n*** ~tw auto skipped.~n"
 			      "    Skipping all cases.", [Func]),
 			{skip_cases_upto(Ref, Cases, SkipReason, conf, CurrMode,
 					 auto_skip_case),
@@ -2803,7 +2812,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 
 	{_,{Skip,Reason},_} when StartConf and ((Skip==skip) or (Skip==skipped)) ->
 	    ReportAbortRepeat(skipped),
-	    print(minor, "~n*** ~w skipped.~n"
+	    print(minor, "~n*** ~tw skipped.~n"
 		  "    Skipping all cases.", [Func]),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
@@ -2813,7 +2822,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 				delete_status(Ref, Status2));
 	{_,{skip_and_save,Reason,_SavedConfig},_} when StartConf ->
 	    ReportAbortRepeat(skipped),
-	    print(minor, "~n*** ~w skipped.~n"
+	    print(minor, "~n*** ~tw skipped.~n"
 		  "    Skipping all cases.", [Func]),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
@@ -2878,7 +2887,7 @@ run_test_cases_loop([{make,Ref,{Mod,Func,Args}}|Cases0], Config, TimetrapData,
 		    Mode, Status) ->
     case run_test_case(Ref, 0, Mod, Func, Args, skip_init, TimetrapData) of
 	{_,Why={'EXIT',_},_} ->
-	    print(minor, "~n*** ~w failed.~n"
+	    print(minor, "~n*** ~tw failed.~n"
  		  "    Skipping all cases.", [Func]),
 	    Reason = {failed,{Mod,Func,Why}},
 	    Cases = skip_cases_upto(Ref, Cases0, Reason, conf, Mode,
@@ -2932,9 +2941,9 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
 		       RunInit, TimetrapData, Mode) of
 	%% callback to framework module failed, exit immediately
 	{_,{framework_error,{FwMod,FwFunc},Reason},_} ->
-	    print(minor, "~n*** ~w failed in ~w. Reason: ~p~n",
+	    print(minor, "~n*** ~w failed in ~tw. Reason: ~tp~n",
 		  [FwMod,FwFunc,Reason]),
-	    print(1, "~w failed in ~w. Reason: ~p~n", [FwMod,FwFunc,Reason]),
+	    print(1, "~w failed in ~tw. Reason: ~tp~n", [FwMod,FwFunc,Reason]),
 	    stop_minor_log_file(),
 	    exit(framework_error);
 	%% sequential execution of test case finished
@@ -2965,7 +2974,7 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
 			    stop_minor_log_file(),
 			    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status1);
 		       true ->	              % skip rest of cases in sequence
-			    print(minor, "~n*** ~w failed.~n"
+			    print(minor, "~n*** ~tw failed.~n"
 				  "    Skipping all other cases in sequence.",
 				  [Func]),
 			    Reason = {failed,{Mod,Func}},
@@ -3105,8 +3114,8 @@ print_conf_time(ConfTime) ->
 print_props([]) ->
     ok;
 print_props(Props) ->
-    print(major, "=group_props   ~p", [Props]),
-    print(minor, "Group properties: ~p~n", [Props]).
+    print(major, "=group_props   ~tp", [Props]),
+    print(minor, "Group properties: ~tp~n", [Props]).
 
 %% repeat N times:                                  {repeat,N}
 %% repeat N times or until all successful:          {repeat_until_all_ok,N}
@@ -3253,13 +3262,13 @@ skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
     ResultCol = if Type == auto -> ?auto_skip_color;
 		   Type == user -> ?user_skip_color
 		end,
-    print(major, "~n=case          ~w:~w", [Mod,Func]),
+    print(major, "~n=case          ~w:~tw", [Mod,Func]),
     GroupName =	case get_name(Mode) of
 		    undefined ->
 			"";
 		    GrName ->
 			GrName1 = cast_to_list(GrName),
-			print(major, "=group_props   ~p", [[{name,GrName1}]]),
+			print(major, "=group_props   ~tp", [[{name,GrName1}]]),
 			GrName1
 		end,
     print(major, "=started       ~s", [lists:flatten(timestamp_get(""))]),
@@ -3270,9 +3279,9 @@ skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
 	    print(major, "=result        skipped: ~ts", [Comment1])
     end,
     if CaseNum == 0 ->
-	    print(2,"*** Skipping ~w ***", [{Mod,Func}]);
+	    print(2,"*** Skipping ~tw ***", [{Mod,Func}]);
        true ->
-	    print(2,"*** Skipping test case #~w ~w ***", [CaseNum,{Mod,Func}])
+	    print(2,"*** Skipping test case #~w ~tw ***", [CaseNum,{Mod,Func}])
     end,
     TR = xhtml("<tr valign=\"top\">", ["<tr class=\"",odd_or_even(),"\">"]),	       
     GroupName =	case get_name(Mode) of
@@ -3283,7 +3292,7 @@ skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
 	  TR ++ "<td>" ++ Col0 ++ "~ts" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "~w" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "~ts" ++ Col1 ++ "</td>"
-	  "<td>" ++ Col0 ++ "~w" ++ Col1 ++ "</td>"
+	  "<td>" ++ Col0 ++ "~tw" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "< >" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "0.000s" ++ Col1 ++ "</td>"
 	  "<td><font color=\"~ts\">SKIPPED</font></td>"
@@ -3504,7 +3513,7 @@ wait_and_resend(Ref, [{_,CurrPid,CaseNum,Mod,Func}|Ps] = Cases, Ok,Skip,Fail) ->
 	{'EXIT',CurrPid,Reason} when Reason /= normal ->
 	    %% unexpected termination of test case process
 	    {value,{_,_,CaseNum,Mod,Func}} = lists:keysearch(CurrPid, 2, Cases),
-	    print(1, "Error! Process for test case #~w (~w:~w) died! Reason: ~p",
+	    print(1, "Error! Process for test case #~w (~w:~tw) died! Reason: ~tp",
 		  [CaseNum, Mod, Func, Reason]),
 	    exit({unexpected_termination,{CaseNum,Mod,Func},{CurrPid,Reason}})
     end;
@@ -3643,7 +3652,7 @@ handle_io_and_exits(Main, CurrPid, CaseNum, Mod, Func, Cases) ->
 	{'EXIT',TCPid,Reason} when Reason /= normal ->
 	    test_server_io:print_buffered(CurrPid),
 	    {value,{_,_,Num,M,F}} = lists:keysearch(TCPid, 2, Cases),
-	    print(1, "Error! Process for test case #~w (~w:~w) died! Reason: ~p",
+	    print(1, "Error! Process for test case #~w (~w:~tw) died! Reason: ~tp",
 		  [Num, M, F, Reason]),
 	    exit({unexpected_termination,{Num,M,F},{TCPid,Reason}})
     end.
@@ -3716,7 +3725,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
     end,
     TSDir = get(test_server_dir),
 
-    print(major, "=case          ~w:~w", [Mod, Func]),
+    print(major, "=case          ~w:~tw", [Mod, Func]),
     MinorName = start_minor_log_file(Mod, Func, self() /= Main),
     MinorBase = filename:basename(MinorName),
     print(major, "=logfile       ~ts", [filename:basename(MinorName)]),
@@ -3778,7 +3787,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
     print(html,	TR ++ "<td>" ++ Col0 ++ "~ts" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "~w" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "~ts" ++ Col1 ++ "</td>"
-	  "<td><a href=\"~ts\">~w</a></td>"
+	  "<td><a href=\"~ts\">~tw</a></td>"
 	  "<td><a href=\"~ts#top\">&lt;</a> <a href=\"~ts#end\">&gt;</a></td>",
 	  [num2str(Num),fw_name(Mod),GrNameStr,EncMinorBase,Func,
 	   EncMinorBase,EncMinorBase]),
@@ -3894,13 +3903,13 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 			{'EXIT',_} = Exit ->
 			    print(minor,
 				  "WARNING: There might be slavenodes left in the"
-				  " system. I tried to kill them, but I failed: ~p\n",
+				  " system. I tried to kill them, but I failed: ~tp\n",
 				  [Exit]);
 			[] -> ok;
 			List ->
 			    print(minor, "WARNING: ~w slave nodes in system after test"++
 				  "case. Tried to killed them.~n"++
-				  "         Names:~p",
+				  "         Names:~tp",
 				  [length(List),List])
 		    end;
 		false ->
@@ -3960,7 +3969,7 @@ progress(skip, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
 	if_auto_skip(Reason,
 		     fun() -> {?auto_skip_color,auto_skip,auto_skipped} end,
 		     fun() -> {?user_skip_color,skip,skipped} end),
-    print(major, "=result        ~w: ~p", [ReportTag,Reason1]),
+    print(major, "=result        ~w: ~tp", [ReportTag,Reason1]),
     print(1, "*** SKIPPED ~ts ***",
 	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{Mod,{Func,GrName},
@@ -3993,7 +4002,7 @@ progress(skip, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
 
 progress(failed, CaseNum, Mod, Func, GrName, Loc, timetrap_timeout, T,
 	 Comment0, {St0,St1}) ->
-    print(major, "=result        failed: timeout, ~p", [Loc]),
+    print(major, "=result        failed: timeout, ~tp", [Loc]),
     print(1, "*** FAILED ~ts ***",
 	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report,
@@ -4019,7 +4028,7 @@ progress(failed, CaseNum, Mod, Func, GrName, Loc, timetrap_timeout, T,
 
 progress(failed, CaseNum, Mod, Func, GrName, Loc, {testcase_aborted,Reason}, _T,
 	 Comment0, {St0,St1}) ->
-    print(major, "=result        failed: testcase_aborted, ~p", [Loc]),
+    print(major, "=result        failed: testcase_aborted, ~tp", [Loc]),
     print(1, "*** FAILED ~ts ***",
 	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report,
@@ -4041,14 +4050,14 @@ progress(failed, CaseNum, Mod, Func, GrName, Loc, {testcase_aborted,Reason}, _T,
     FormatLoc = test_server_sup:format_loc(Loc),
     print(minor, "=== Location: ~ts", [FormatLoc]),
     print(minor,
-	  escape_chars(io_lib:format("=== Reason: {testcase_aborted,~p}",
+	  escape_chars(io_lib:format("=== Reason: {testcase_aborted,~tp}",
 				     [Reason])),
 	  []),
     failed;
 
 progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
 	 Comment0, {St0,St1}) ->
-    print(major, "=result        failed: ~p, ~w", [Reason,unknown_location]),
+    print(major, "=result        failed: ~tp, ~w", [Reason,unknown_location]),
     print(1, "*** FAILED ~ts ***",
 	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{Mod,{Func,GrName},
@@ -4056,7 +4065,7 @@ progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
 			       true -> "~w"
 			    end, [Time]),
-    ErrorReason = escape_chars(lists:flatten(io_lib:format("~p", [Reason]))),
+    ErrorReason = escape_chars(lists:flatten(io_lib:format("~tp", [Reason]))),
     ErrorReason1 = lists:flatten([string:strip(S,left) ||
 				  S <- string:tokens(ErrorReason,[$\n])]),
     ErrorReason2 =
@@ -4093,7 +4102,7 @@ progress(failed, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
 			      end;
 			 true -> {Loc,Loc}
 		       end,
-    print(major, "=result        failed: ~p, ~p", [Reason,LocMaj]),
+    print(major, "=result        failed: ~tp, ~tp", [Reason,LocMaj]),
     print(1, "*** FAILED ~ts ***",
 	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{Mod,{Func,GrName},
@@ -4236,7 +4245,7 @@ update_skip_counters(Pat, {US,AS}) ->
     Result.
 
 get_info_str(Mod,Func, 0, _Cases) ->
-    io_lib:format("~w", [{Mod,Func}]);
+    io_lib:format("~tw", [{Mod,Func}]);
 get_info_str(_Mod,_Func, CaseNum, unknown) ->
     "test case " ++ integer_to_list(CaseNum);
 get_info_str(_Mod,_Func, CaseNum, Cases) ->
@@ -4251,11 +4260,11 @@ print_if_known(Known, {SK,AK}, {SU,AU}) ->
 
 to_string(Term) when is_list(Term) ->
     case (catch io_lib:format("~ts", [Term])) of
-	{'EXIT',_} -> lists:flatten(io_lib:format("~p", [Term]));
+	{'EXIT',_} -> lists:flatten(io_lib:format("~tp", [Term]));
 	String     -> lists:flatten(String)
     end;
 to_string(Term) ->
-    lists:flatten(io_lib:format("~p", [Term])).
+    lists:flatten(io_lib:format("~tp", [Term])).
 
 get_last_loc(Loc) when is_tuple(Loc) ->
     Loc;
@@ -4327,14 +4336,14 @@ format_exception(Reason={_Error,Stack}) when is_list(Stack) ->
 	undefined ->
 	    case application:get_env(test_server, format_exception) of
 		{ok,false} ->
-		    {"~p",Reason};
+		    {"~tp",Reason};
 		_ ->
 		    do_format_exception(Reason)
 	    end;
 	FW ->
 	    case application:get_env(FW, format_exception) of
 		{ok,false} ->
-		    {"~p",Reason};
+		    {"~tp",Reason};
 		_ ->
 		    do_format_exception(Reason)
 	    end
@@ -4345,13 +4354,13 @@ format_exception(Error) ->
 do_format_exception(Reason={Error,Stack}) ->
     StackFun = fun(_, _, _) -> false end,
     PF = fun(Term, I) ->
-		 io_lib:format("~." ++ integer_to_list(I) ++ "p", [Term])
+		 io_lib:format("~." ++ integer_to_list(I) ++ "tp", [Term])
 	 end,
-    case catch lib:format_exception(1, error, Error, Stack, StackFun, PF) of
-	{'EXIT',_} ->
-	    {"~p",Reason};
+    case catch lib:format_exception(1, error, Error, Stack, StackFun, PF, utf8) of
+	{'EXIT',_R} ->
+	    {"~tp",Reason};
 	Formatted  ->
-	    Formatted1 = re:replace(Formatted, "exception error: ", "", [{return,list}]),
+	    Formatted1 = re:replace(Formatted, "exception error: ", "", [{return,list},unicode]),
 	    {"~ts",lists:flatten(Formatted1)}
     end.
 
@@ -4457,7 +4466,7 @@ format(Detail, Format, Args) ->
     Str =
 	case catch io_lib:format(Format, Args) of
 	    {'EXIT',_} ->
-		io_lib:format("illegal format; ~p with args ~p.\n",
+		io_lib:format("illegal format; ~tp with args ~tp.\n",
 			      [Format,Args]);
 	    Valid -> Valid
 	end,
@@ -4853,7 +4862,7 @@ collect_files(Dir, Pattern, St, Mode) ->
     Wc = filename:join([Dir1,Pattern++"{.erl,"++code:objfile_extension()++"}"]),
     case catch filelib:wildcard(Wc) of
 	{'EXIT', Reason} ->
-	    io:format("Could not collect files: ~p~n", [Reason]),
+	    io:format("Could not collect files: ~tp~n", [Reason]),
 	    {error,{collect_fail,Dir,Pattern}};
 	Files ->
 	    %% convert to module names and remove duplicates
@@ -4897,13 +4906,13 @@ check_deny_req({Req,Val}, DenyList) ->
     %%io:format("ValCheck ~p=~p in ~p\n", [Req,Val,DenyList]),
     case lists:keysearch(Req, 1, DenyList) of
 	{value,{_Req,DenyVal}} when Val >= DenyVal ->
-	    {denied,io_lib:format("Requirement ~p=~p", [Req,Val])};
+	    {denied,io_lib:format("Requirement ~tp=~tp", [Req,Val])};
 	_ ->
 	    check_deny_req(Req, DenyList)
     end;
 check_deny_req(Req, DenyList) ->
     case lists:member(Req, DenyList) of
-	true -> {denied,io_lib:format("Requirement ~p", [Req])};
+	true -> {denied,io_lib:format("Requirement ~tp", [Req])};
 	false -> granted
     end.
 
@@ -5004,7 +5013,7 @@ get_target_info() ->
 
 start_node(Name, Type, Options) ->
     T = 10 * ?ACCEPT_TIMEOUT * test_server:timetrap_scale_factor(),
-    format(minor, "Attempt to start ~w node ~p with options ~p",
+    format(minor, "Attempt to start ~w node ~tp with options ~tp",
 	   [Type, Name, Options]),
     case controller_call({start_node,Name,Type,Options}, T) of
 	{{ok,Nodename}, Host, Cmd, Info, Warning} ->
@@ -5026,16 +5035,16 @@ start_node(Name, Type, Options) ->
 	{fail,{Ret, Host, Cmd}}  ->
 	    format(minor,
 		   "Failed to start node ~tp on ~tp with command: ~ts~n"
-		   "Reason: ~p",
+		   "Reason: ~tp",
 		   [Name, Host, Cmd, Ret]),
 	    {fail,Ret};
 	{Ret, undefined, undefined} ->
-	    format(minor, "Failed to start node ~tp: ~p", [Name,Ret]),
+	    format(minor, "Failed to start node ~tp: ~tp", [Name,Ret]),
 	    Ret;
 	{Ret, Host, Cmd} ->
 	    format(minor,
 		   "Failed to start node ~tp on ~tp with command: ~ts~n"
-		   "Reason: ~p",
+		   "Reason: ~tp",
 		   [Name, Host, Cmd, Ret]),
 	    Ret
     end.
@@ -5134,8 +5143,8 @@ display_info([Pid|T], R, M) ->
 	    Reds  = fetch(reductions, Info),
 	    LM = length(fetch(messages, Info)),
 	    pformat(io_lib:format("~w", [Pid]),
-		    io_lib:format("~w", [Call]),
-		    io_lib:format("~w", [Curr]), Reds, LM),
+		    io_lib:format("~tw", [Call]),
+		    io_lib:format("~tw", [Curr]), Reds, LM),
 	    display_info(T, R+Reds, M + LM)
     end;
 display_info([], R, M) ->
@@ -5249,11 +5258,11 @@ read_cover_file(CoverFile) ->
 	    case check_cover_file(List, [], [], []) of
 		{ok,Exclude,Include,Cross} -> {Exclude,Include,Cross};
 		error ->
-		    io:fwrite("Faulty format of CoverFile ~p\n", [CoverFile]),
+		    io:fwrite("Faulty format of CoverFile ~tp\n", [CoverFile]),
 		    {[],[],[]}
 	    end;
 	{error,Reason} ->
-	    io:fwrite("Can't read CoverFile ~ts\nReason: ~p\n",
+	    io:fwrite("Can't read CoverFile ~ts\nReason: ~tp\n",
 		      [CoverFile,Reason]),
 	    {[],[],[]}
     end.
@@ -5521,8 +5530,8 @@ write_coverlog_header(CoverLog) ->
     case catch io:put_chars(CoverLog,html_header("Coverage results")) of
 	{'EXIT',Reason} ->
 	    io:format("\n\nERROR: Could not write normal heading in coverlog.\n"
-		      "CoverLog: ~w\n"
-		      "Reason: ~p\n",
+		      "CoverLog: ~tw\n"
+		      "Reason: ~tp\n",
 		      [CoverLog,Reason]),
 	    io:format(CoverLog,"<html><body>\n", []);
 	_ ->
diff --git a/lib/common_test/src/test_server_gl.erl b/lib/common_test/src/test_server_gl.erl
index 4845b86dd3..f5329eb774 100644
--- a/lib/common_test/src/test_server_gl.erl
+++ b/lib/common_test/src/test_server_gl.erl
@@ -173,8 +173,8 @@ handle_info({'DOWN',Ref,process,_,Reason}=D, #st{minor_monitor=Ref}=St) ->
     case Reason of
 	normal -> ok;
 	_ ->
-	    Data = io_lib:format("=== WARNING === TC: ~w\n"
-				 "Got down from minor Fd ~w: ~w\n\n",
+	    Data = io_lib:format("=== WARNING === TC: ~tw\n"
+				 "Got down from minor Fd ~w: ~tw\n\n",
 				 [St#st.tc,St#st.minor,D]),
 	    test_server_io:print_unexpected(Data)
     end,
@@ -319,7 +319,7 @@ output(Level, Str, Sender, From, St) when is_atom(Level) ->
     output_to_file(Level, dress_output(Str, Sender, St), From, St).
 
 output_to_file(minor, Data0, From, #st{tc={M,F,A},minor=none}) ->
-    Data = [io_lib:format("=== ~w:~w/~w\n", [M,F,A]),Data0],
+    Data = [io_lib:format("=== ~w:~tw/~w\n", [M,F,A]),Data0],
     test_server_io:print(From, unexpected_io, Data),
     ok;
 output_to_file(minor, Data, From, #st{tc=TC,minor=Fd}) ->
@@ -328,10 +328,10 @@ output_to_file(minor, Data, From, #st{tc=TC,minor=Fd}) ->
     catch
 	Type:Reason ->
 	    Data1 =
-		[io_lib:format("=== ERROR === TC: ~w\n"
+		[io_lib:format("=== ERROR === TC: ~tw\n"
 			       "Failed to write to minor Fd: ~w\n"
 			       "Type: ~w\n"
-			       "Reason: ~w\n",
+			       "Reason: ~tw\n",
 			       [TC,Fd,Type,Reason]),
 		 Data,"\n"],
 	    test_server_io:print(From, unexpected_io, Data1)
diff --git a/lib/common_test/src/test_server_io.erl b/lib/common_test/src/test_server_io.erl
index fdabf17b08..0b70b78f7f 100644
--- a/lib/common_test/src/test_server_io.erl
+++ b/lib/common_test/src/test_server_io.erl
@@ -359,7 +359,7 @@ handle_info(kill_group_leaders, #st{gls=Gls,stopping=From,
 		      end, St#st{phase=idle,pending_ops=[]}, Ops),
     {noreply,St1};
 handle_info(Other, St) ->
-    io:format("Ignoring: ~p\n", [Other]),
+    io:format("Ignoring: ~tp\n", [Other]),
     {noreply,St}.
 
 terminate(_, _) ->
@@ -395,7 +395,7 @@ do_output(Tag, Str, Phase, #st{fds=Fds}=St) ->
 	none when Phase /= started ->
 	    buffer;
 	none ->
-	    S = io_lib:format("\n*** ERROR: ~w, line ~w: No known '~p' log file\n",
+	    S = io_lib:format("\n*** ERROR: ~w, line ~w: No known '~tp' log file\n",
 			      [?MODULE,?LINE,Tag]),
 	    do_output(stdout, [S,Str], Phase, St);
 	{value,Fd} ->
@@ -407,7 +407,7 @@ do_output(Tag, Str, Phase, #st{fds=Fds}=St) ->
 		end
 	    catch _:Error ->
 		    S = io_lib:format("\n*** ERROR: ~w, line ~w: Error writing to "
-				      "log file '~p': ~p\n",
+				      "log file '~tp': ~tp\n",
 				      [?MODULE,?LINE,Tag,Error]),
 		    do_output(stdout, [S,Str], Phase, St)
 	    end
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index 32d7d14a1b..a18ff1fd62 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -237,23 +237,23 @@ print_trc(Out,{trace_ts,P,call,{M,F,A},C,Ts},N) ->
     io:format(Out,
 	      "~w: ~s~n"
 	      "Process   : ~w~n"
-	      "Call      : ~w:~w/~w~n"
-	      "Arguments : ~p~n"
-	      "Caller    : ~w~n~n",
+	      "Call      : ~w:~tw/~w~n"
+	      "Arguments : ~tp~n"
+	      "Caller    : ~tw~n~n",
 	      [N,ts(Ts),P,M,F,length(A),A,C]);
 print_trc(Out,{trace_ts,P,call,{M,F,A},Ts},N) ->
     io:format(Out,
 	      "~w: ~s~n"
 	      "Process   : ~w~n"
-	      "Call      : ~w:~w/~w~n"
-	      "Arguments : ~p~n~n",
+	      "Call      : ~w:~tw/~w~n"
+	      "Arguments : ~tp~n~n",
 	      [N,ts(Ts),P,M,F,length(A),A]);
 print_trc(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
     io:format(Out,
 	      "~w: ~s~n"
 	      "Process      : ~w~n"
-	      "Return from  : ~w:~w/~w~n"
-	      "Return value : ~p~n~n",
+	      "Return from  : ~w:~tw/~w~n"
+	      "Return value : ~tp~n~n",
 	      [N,ts(Ts),P,M,F,A,R]);
 print_trc(Out,{drop,X},N) ->
     io:format(Out,
@@ -263,7 +263,7 @@ print_trc(Out,Trace,N) ->
     Ts = element(size(Trace),Trace),
     io:format(Out,
 	      "~w: ~s~n"
-	      "Trace        : ~p~n~n",
+	      "Trace        : ~tp~n~n",
 	      [N,ts(Ts),Trace]).
 ts({_, _, Micro} = Now) ->
     {{Y,M,D},{H,Min,S}} = calendar:now_to_local_time(Now),
@@ -580,7 +580,7 @@ kill_node(SI) ->
 
 cast_to_list(X) when is_list(X) -> X;
 cast_to_list(X) when is_atom(X) -> atom_to_list(X);
-cast_to_list(X) -> lists:flatten(io_lib:format("~w", [X])).
+cast_to_list(X) -> lists:flatten(io_lib:format("~tw", [X])).
 
 
 %%% L contains elements of the forms
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl
index 6922e01fcc..f7c970726f 100644
--- a/lib/common_test/src/test_server_sup.erl
+++ b/lib/common_test/src/test_server_sup.erl
@@ -83,7 +83,7 @@ kill_the_process(Pid, Timeout0, TruncTO, ReportTVal) ->
 			    "Testcase process ~w not "
 			    "responding to timetrap "
 			    "timeout:~n"
-			    "  ~p.~n"
+			    "  ~tp.~n"
 			    "Killing testcase...~n",
 			    [Pid, Trap]),
 		    exit(Pid, kill)
@@ -144,11 +144,11 @@ call_crash(Time,Crash,M,F,A) ->
 	    {'EXIT',Pid,_Reason} when Crash==any ->
 		ok;
 	    {'EXIT',Reason} ->
-		test_server:format(12, "Wrong crash reason. Wanted ~p, got ~p.",
+		test_server:format(12, "Wrong crash reason. Wanted ~tp, got ~tp.",
 		      [Crash, Reason]),
 		exit({wrong_crash_reason,Reason});
 	    {'EXIT',Pid,Reason} ->
-		test_server:format(12, "Wrong crash reason. Wanted ~p, got ~p.",
+		test_server:format(12, "Wrong crash reason. Wanted ~tp, got ~tp.",
 		      [Crash, Reason]),
 		exit({wrong_crash_reason,Reason});
 	    {'EXIT',OtherPid,Reason} when OldTrapExit == false ->
@@ -334,11 +334,11 @@ do_appup_tests(_, _Application, Up, Down, Modules) ->
                 ok ->
                     test_server:format(minor, "OK~n");
                 Error ->
-                    test_server:format(minor, "ERROR ~p~n", [Error]),
+                    test_server:format(minor, "ERROR ~tp~n", [Error]),
                     test_server:fail(Error)
             end;
         Error ->
-            test_server:format(minor, "ERROR ~p~n", [Error]),
+            test_server:format(minor, "ERROR ~tp~n", [Error]),
             test_server:fail(Error)
     end.
     
@@ -557,7 +557,7 @@ check_dict(Dict, Reason) ->
 	[] ->
 	    1;                         % All ok.
 	List ->
-	    io:format("** ~ts (~ts) ->~n~p~n",[Reason, Dict, List]),
+	    io:format("** ~ts (~ts) ->~n~tp~n",[Reason, Dict, List]),
 	    0
     end.
 
@@ -566,7 +566,7 @@ check_dict_tolerant(Dict, Reason, Mode) ->
 	[] ->
 	    1;                         % All ok.
 	List ->
-	    io:format("** ~ts (~ts) ->~n~p~n",[Reason, Dict, List]),
+	    io:format("** ~ts (~ts) ->~n~tp~n",[Reason, Dict, List]),
 	    case Mode of
 		pedantic ->
 		    0;
@@ -646,7 +646,7 @@ append_files_to_logfile([File|Files]) ->
 		    %% fail, but in that case it will throw an exception so that
 		    %% we will be aware of the problem.
 		    io:format(Fd, "Unable to write the crash dump "
-			      "to this file: ~p~n", [file:format_error(Error)])
+			      "to this file: ~tp~n", [file:format_error(Error)])
 	    end;
 	_Error ->
 	    io:format(Fd, "Failed to read: ~ts\n", [File])
@@ -802,9 +802,9 @@ format_loc([{Mod,Func,Line}|Rest]) ->
 format_loc([{Mod,LineOrFunc}]) ->
     format_loc({Mod,LineOrFunc});
 format_loc({Mod,Func}) when is_atom(Func) -> 
-    io_lib:format("{~w,~w}",[Mod,Func]);
+    io_lib:format("{~w,~tw}",[Mod,Func]);
 format_loc(Loc) ->
-    io_lib:format("~p",[Loc]).
+    io_lib:format("~tp",[Loc]).
 
 format_loc1([{Mod,Func,Line}]) ->
     ["              ",format_loc1({Mod,Func,Line}),"]"];
@@ -824,12 +824,12 @@ format_loc1({Mod,Func,Line}) ->
 		      true ->
 			   Line
 		   end,
-	    io_lib:format("{~w,~w,<a href=\"~ts~ts#~s\">~w</a>}",
+	    io_lib:format("{~w,~tw,<a href=\"~ts~ts#~ts\">~tw</a>}",
 			  [Mod,Func,
 			   test_server_ctrl:uri_encode(downcase(ModStr)),
 			   ?src_listing_ext,Link,Line]);
 	_ ->
-	    io_lib:format("{~w,~w,~w}",[Mod,Func,Line])
+	    io_lib:format("{~w,~tw,~tw}",[Mod,Func,Line])
     end.
 
 downcase(S) -> downcase(S, []).
diff --git a/lib/common_test/src/unix_telnet.erl b/lib/common_test/src/unix_telnet.erl
index 0f29b2dbb2..3d7873c3e6 100644
--- a/lib/common_test/src/unix_telnet.erl
+++ b/lib/common_test/src/unix_telnet.erl
@@ -132,25 +132,25 @@ connect1(Name,Ip,Port,Timeout,KeepAlive,TCPNoDelay,Username,Password) ->
 					 Prompt=/=?password ->
 					{ok,Pid};
 				    Error ->
-					log(Name,recv,"Password failed\n~p\n",
+					log(Name,recv,"Password failed\n~tp\n",
 					    [Error]),
 					{error,Error}
 				end;
 			    Error ->
-				log(Name,recv,"Login to ~p:~p failed\n~p\n",[Ip,Port,Error]),
+				log(Name,recv,"Login to ~p:~p failed\n~tp\n",[Ip,Port,Error]),
 				{error,Error}
 			end;
 		    {ok,[{prompt,_OtherPrompt1},{prompt,_OtherPrompt2}],_} ->
 			{ok,Pid};
 		    Error ->
 			log(Name,conn_error,
-			    "Did not get expected prompt from ~p:~p\n~p\n",
+			    "Did not get expected prompt from ~p:~p\n~tp\n",
 			    [Ip,Port,Error]),
 			{error,Error}
 		end;
 	    Error ->
 		log(Name,conn_error,
-		    "Could not open telnet connection to ~p:~p\n~p\n",
+		    "Could not open telnet connection to ~p:~p\n~tp\n",
 		    [Ip,Port,Error]),
 		Error
 	end,
diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index f1c5051164..54cf7b7dab 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -250,7 +250,7 @@ loop(State) ->
 	{'EXIT',Pid,Reason} ->
 	    case State#state.test_runner of
 		Pid ->
-		    io:format("Test run error: ~p\n",[Reason]),
+		    io:format("Test run error: ~tp\n",[Reason]),
 		    loop(State);
 		_ ->
 		    loop(State)
@@ -551,7 +551,7 @@ case_select(Dir,Suite,Case,N) ->
 	    true = code:add_pathz(Dir),
 	    case catch apply(Suite,all,[]) of
 		{'EXIT',Reason} ->
-		    io:format("\n~p\n",[Reason]),
+		    io:format("\n~tp\n",[Reason]),
 		    red(["COULD NOT READ TESTCASES!!",br(),
 			 "See erlang shell for info"]);
 		{skip,_Reason} ->
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 4f3e0e8266..0d9149f489 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -72,7 +72,8 @@ MODULES= \
 	ct_release_test_SUITE \
 	ct_log_SUITE \
         ct_SUITE \
-	ct_keep_logs_SUITE
+	ct_keep_logs_SUITE \
+	ct_unicode_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 HRL_FILES= test_server_test_lib.hrl
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index cbbfe408a8..97c7abf3e6 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -172,10 +172,10 @@ testspec_dynamic(Config) when is_list(Config) ->
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 make_spec(DataDir, ConfigDir, Filename, Suites, Config)->
-    {ok, Fd} = file:open(filename:join(ConfigDir, Filename), [write]),
-    ok = file:write(Fd,
-		    io_lib:format("{suites, \"~sconfig/test/\", ~p}.~n", [DataDir, Suites])),
-    lists:foreach(fun(C)-> ok=file:write(Fd, io_lib:format("~p.~n", [C])) end, Config),
+    {ok, Fd} = file:open(filename:join(ConfigDir, Filename),
+                         [write, {encoding,utf8}]),
+    ok = io:format(Fd,"{suites, \"~tsconfig/test/\", ~p}.~n", [DataDir, Suites]),
+    lists:foreach(fun(C)-> ok=io:format(Fd, "~tp.~n", [C]) end, Config),
     ok = file:close(Fd).
 
 run_test(Name, Config, CTConfig, SuiteNames)->
diff --git a/lib/common_test/test/ct_keep_logs_SUITE.erl b/lib/common_test/test/ct_keep_logs_SUITE.erl
index 6b7aaa57ac..83b7963d7d 100644
--- a/lib/common_test/test/ct_keep_logs_SUITE.erl
+++ b/lib/common_test/test/ct_keep_logs_SUITE.erl
@@ -72,7 +72,7 @@ keep_logs(Config) ->
     LogDir=?config(logdir,Opts),
     KeepLogsDir = create_dir(filename:join(LogDir,"keep_logs-")),
     Opts1 = lists:keyreplace(logdir,1,Opts,{logdir,KeepLogsDir}),
-    ct:log("New LogDir = ~s", [KeepLogsDir]),
+    ct:log("New LogDir = ~ts", [KeepLogsDir]),
 
     %% Create 6 ct_run.* log directories
     [ok = ct_test_support:run(Opts1, Config) || _ <- lists:seq(1,3)],
@@ -134,7 +134,7 @@ refresh_logs(Config) ->
     LogDir=?config(logdir,Opts0),
     KeepLogsDir = create_dir(filename:join(LogDir,"refresh_logs-")),
     Opts1 = lists:keyreplace(logdir,1,Opts0,{logdir,KeepLogsDir}),
-    ct:log("New LogDir = ~s", [KeepLogsDir]),
+    ct:log("New LogDir = ~ts", [KeepLogsDir]),
 
     %% Create 6 ct_run.* log directories
     SuiteOpts = [{suite,Suite},{label,refresh_logs} | Opts1],
diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
index 832e105517..a71288fb12 100644
--- a/lib/common_test/test/ct_surefire_SUITE.erl
+++ b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -304,7 +304,7 @@ test_events(Test) ->
 check_xml(Case,XmlRe) ->
     case filelib:wildcard(XmlRe) of
 	[] ->
-	    ct:fail("No xml files found with regexp ~p~n", [XmlRe]);
+	    ct:fail("No xml files found with regexp ~tp~n", [XmlRe]);
 	[_] = Xmls when Case==absolute_path ->
 	    do_check_xml(Case,Xmls);
 	[_,_] = Xmls ->
@@ -326,12 +326,12 @@ check_xml(Case,XmlRe) ->
 %%  ...
 %% </testsuites>
 do_check_xml(Case,[Xml|Xmls]) ->
-    ct:log("Checking <a href=~p>~s</a>~n",[Xml,Xml]),
+    ct:log("Checking <a href=~tp>~ts</a>~n",[Xml,Xml]),
     {E,_} = xmerl_scan:file(Xml),
     Expected = events_to_result(lists:flatten(test_events(Case))),
     ParseResult = testsuites(Case,E),
-    ct:log("Expecting: ~p~n",[Expected]),
-    ct:log("Actual   : ~p~n",[ParseResult]),
+    ct:log("Expecting: ~tp~n",[Expected]),
+    ct:log("Actual   : ~tp~n",[ParseResult]),
     Expected = ParseResult,
     do_check_xml(Case,Xmls);
 do_check_xml(_,[]) ->
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index ba7aadfeec..44c27e54c2 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -67,7 +67,7 @@ init_per_suite(Config, Level) ->
     end,
     case delete_old_logs(os:type(), Config) of
 	{'EXIT',DelLogsReason} ->
-	    test_server:format(0, "Failed to delete old log directories: ~p~n", 
+	    test_server:format(0, "Failed to delete old log directories: ~tp~n",
 			       [DelLogsReason]);
 	_ ->
 	    ok
@@ -91,7 +91,8 @@ start_slave(NodeName, Config, Level) ->
     [_,Host] = string:tokens(atom_to_list(node()), "@"),
     test_server:format(0, "Trying to start ~s~n",
 		       [atom_to_list(NodeName)++"@"++Host]),
-    case slave:start(Host, NodeName, []) of
+    PR = proplists:get_value(printable_range,Config,io:printable_range()),
+    case slave:start(Host, NodeName, "+pc " ++ atom_to_list(PR)) of
 	{error,Reason} ->
 	    test_server:fail(Reason);
 	{ok,CTNode} ->
@@ -119,7 +120,7 @@ start_slave(NodeName, Config, Level) ->
 	    [true = rpc:call(CTNode, code, add_patha, [D]) || D <- PathDirs],
 	    test_server:format(Level, "Dirs added to code path (on ~w):~n",
 			       [CTNode]),
-	    [io:format("~s~n", [D]) || D <- PathDirs],
+	    [io:format("~ts~n", [D]) || D <- PathDirs],
 	    
 	    case proplists:get_value(start_sasl, Config) of
 		true ->
@@ -161,12 +162,12 @@ init_per_testcase(_TestCase, Config) ->
     case lists:keysearch(master, 1, Config) of
 	false->
 	    test_server:format("See Common Test logs here:\n\n"
-			       "<a href=\"file://~s/all_runs.html\">~s/all_runs.html</a>\n"
-			       "<a href=\"file://~s/index.html\">~s/index.html</a>",
+			       "<a href=\"file://~ts/all_runs.html\">~ts/all_runs.html</a>\n"
+			       "<a href=\"file://~ts/index.html\">~ts/index.html</a>",
 			       [LogDir,LogDir,LogDir,LogDir]);
 	{value, _}->
 	    test_server:format("See CT Master Test logs here:\n\n"
-		       "<a href=\"file://~s/master_runs.html\">~s/master_runs.html</a>",
+		       "<a href=\"file://~ts/master_runs.html\">~ts/master_runs.html</a>",
 		       [LogDir,LogDir])
     end,
     Config.
@@ -192,11 +193,11 @@ write_testspec(TestSpec, Dir, Name) ->
     write_testspec(TestSpec, filename:join(Dir, Name)).
 
 write_testspec(TestSpec, TSFile) ->
-    {ok,Dev} = file:open(TSFile, [write]),
-    [io:format(Dev, "~p.~n", [Entry]) || Entry <- TestSpec],
+    {ok,Dev} = file:open(TSFile, [write,{encoding,utf8}]),
+    [io:format(Dev, "~tp.~n", [Entry]) || Entry <- TestSpec],
     file:close(Dev),
-    io:format("Test specification written to: ~p~n", [TSFile]),
-    io:format(user, "Test specification written to: ~p~n", [TSFile]),
+    io:format("Test specification written to: ~tp~n", [TSFile]),
+    io:format(user, "Test specification written to: ~tp~n", [TSFile]),
     TSFile.
     
 
@@ -269,7 +270,7 @@ run(Opts0, Config) when is_list(Opts0) ->
 				Override =
 				    fun(O={Key,_}, Os) ->
 					    io:format(user, "ADDING START "
-						      "OPTION: ~p~n", [O]),
+						      "OPTION: ~tp~n", [O]),
 					    [O | lists:keydelete(Key, 1, Os)]
 				    end,
 				lists:foldl(Override, Opts0, OROpts);
@@ -291,14 +292,14 @@ run(Opts0, Config) when is_list(Opts0) ->
 run_ct_run_test(Opts,Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
-    test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~p) on ~p~n",
+    test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~tp) on ~p~n",
 		       [Opts, CTNode]),
     
     T0 = erlang:monotonic_time(),
     CtRunTestResult = rpc:call(CTNode, ct, run_test, [Opts]),
     T1 = erlang:monotonic_time(),
     Elapsed = erlang:convert_time_unit(T1-T0, native, milli_seconds),
-    test_server:format(Level, "~n[RUN #1] Got return value ~p after ~p ms~n",
+    test_server:format(Level, "~n[RUN #1] Got return value ~tp after ~p ms~n",
 		       [CtRunTestResult,Elapsed]),
     case rpc:call(CTNode, erlang, whereis, [ct_util_server]) of
 	undefined ->
@@ -316,7 +317,7 @@ run_ct_script_start(Opts, Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
     Opts1 = [{halt_with,{?MODULE,ct_test_halt}} | Opts],
-    test_server:format(Level, "Saving start opts on ~p: ~p~n",
+    test_server:format(Level, "Saving start opts on ~p: ~tp~n",
 		       [CTNode, Opts1]),
     rpc:call(CTNode, application, set_env,
 	     [common_test, run_test_start_opts, Opts1]),
@@ -326,7 +327,7 @@ run_ct_script_start(Opts, Config) ->
     ExitStatus = rpc:call(CTNode, ct_run, script_start, []),
     T1 = erlang:monotonic_time(),
     Elapsed = erlang:convert_time_unit(T1-T0, native, milli_seconds),
-    test_server:format(Level, "[RUN #2] Got exit status value ~p after ~p ms~n",
+    test_server:format(Level, "[RUN #2] Got exit status value ~tp after ~p ms~n",
 		       [ExitStatus,Elapsed]),
     ExitStatus.
 
@@ -372,12 +373,12 @@ run({M,F,A}, InitCalls, Config) ->
     Level = proplists:get_value(trace_level, Config),
     lists:foreach(
       fun({IM,IF,IA}) ->
-	      test_server:format(Level, "~nInit call ~w:~w(~p) on ~p...~n",
+	      test_server:format(Level, "~nInit call ~w:~tw(~tp) on ~p...~n",
 				 [IM, IF, IA, CTNode]),
 	      Result = rpc:call(CTNode, IM, IF, IA),
-	      test_server:format(Level, "~n...with result: ~p~n", [Result])
+	      test_server:format(Level, "~n...with result: ~tp~n", [Result])
       end, InitCalls),
-    test_server:format(Level, "~nStarting test with ~w:~w(~p) on ~p~n",
+    test_server:format(Level, "~nStarting test with ~w:~tw(~tp) on ~p~n",
 		       [M, F, A, CTNode]),
     rpc:call(CTNode, M, F, A).
 
@@ -404,7 +405,7 @@ wait_for_ct_stop(Retries, CTNode) ->
 	    Info = (catch process_info(Pid)),
 	    test_server:format(0, "Waiting for CT (~p) to finish (~p)...", 
 			       [Pid,Retries]),
-	    test_server:format(0, "Process info for ~p:~n~p", [Info]), 
+	    test_server:format(0, "Process info for ~p:~n~tp", [Pid,Info]),
 	    timer:sleep(5000),
 	    wait_for_ct_stop(Retries-1, CTNode)
     end.
@@ -414,7 +415,7 @@ wait_for_ct_stop(Retries, CTNode) ->
 ct_rpc({M,F,A}, Config) ->
     CTNode = proplists:get_value(ct_node, Config),
     Level = proplists:get_value(trace_level, Config),
-    test_server:format(Level, "~nCalling ~w:~w(~p) on ~p...",
+    test_server:format(Level, "~nCalling ~w:~tw(~tp) on ~p...",
 		       [M,F,A, CTNode]),
     rpc:call(CTNode, M, F, A).
 
@@ -530,7 +531,7 @@ verify_events(TEvs, Evs, Node, Config) ->
 
 verify_events1([TestEv|_], [{TEH,#event{name=stop_logging,node=Node,data=_}}|_], Node, _)
   when element(1,TestEv) == TEH, element(2,TestEv) =/= stop_logging ->
-    test_server:format("Failed to find ~p in the list of events!~n", [TestEv]),
+    test_server:format("Failed to find ~tp in the list of events!~n", [TestEv]),
     exit({event_not_found,TestEv});
 
 verify_events1(TEvs = [TestEv | TestEvs], Evs = [_|Events], Node, Config) ->
@@ -538,8 +539,8 @@ verify_events1(TEvs = [TestEv | TestEvs], Evs = [_|Events], Node, Config) ->
 	nomatch ->
 	    verify_events1(TEvs, Events, Node, Config);
 	{'EXIT',Reason} ->
-	    test_server:format("Failed to find ~p in ~p~n"
-			       "Reason: ~p~n", [TestEv,Evs,Reason]),
+	    test_server:format("Failed to find ~tp in ~tp~n"
+			       "Reason: ~tp~n", [TestEv,Evs,Reason]),
 	    exit(Reason);
 	{Config1,Events1} ->
 	    if is_list(TestEv) ->
@@ -547,13 +548,13 @@ verify_events1(TEvs = [TestEv | TestEvs], Evs = [_|Events], Node, Config) ->
 	       element(1,TestEv) == parallel ; element(1,TestEv) == shuffle ->
 		    ok;
 	       true ->
-		    test_server:format("Found ~p!", [TestEv])
+		    test_server:format("Found ~tp!", [TestEv])
 	    end,
 	    verify_events1(TestEvs, Events1, Node, Config1)
     end;
 
 verify_events1([TestEv|_], [], _, _) ->
-    test_server:format("Failed to find ~p in the list of events!~n", [TestEv]),
+    test_server:format("Failed to find ~tp in the list of events!~n", [TestEv]),
     exit({event_not_found,TestEv});
 
 verify_events1([], Evs, _, Config) ->
@@ -586,8 +587,8 @@ locate(TEvs, Node, Evs, Config) when is_list(TEvs) ->
 			false ->
 			    nomatch;
 			true ->
-			    test_server:format("Found ~p!", [InitStart]),
-			    test_server:format("Found ~p!", [InitDone]),
+			    test_server:format("Found ~tp!", [InitStart]),
+			    test_server:format("Found ~tp!", [InitDone]),
 			    verify_events1(TEvs1, Evs1, Node, Config)
 		    end;
 		_ ->
@@ -635,8 +636,8 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					true
 				end, Es),	      
 			
-			test_server:format("Found ~p!", [InitStart]),
-			test_server:format("Found ~p!", [InitDone]),
+			test_server:format("Found ~tp!", [InitStart]),
+			test_server:format("Found ~tp!", [InitDone]),
 			{TEs,EvsG};
 		    _ ->
 			nomatch
@@ -688,10 +689,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] when Evs2 == [] ->
 				  exit({unmatched,TEv});
 			      [] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  exit({tc_done_not_found,TEv});
 			      [TcDone|Evs3] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  RemSize1 = length(Evs3),
 				  if RemSize1 < RemSize ->
 					  {[TcDone|Done],Evs3,RemSize1};
@@ -707,7 +708,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 				     EH == TEH, EvNode == Node, Mod == M, 
 				     Func == F, result_match(R, Result)] of
 			      [TcDone|_] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {lists:delete(TcDone, Done),RemEvs,RemSize};
 			      [] ->
 				  exit({unmatched,TEv})
@@ -735,7 +736,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] -> 
 				  exit({end_per_group_not_found,TEv});
 			      [_ | RemEvs2] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% tc_done event for end_per_group
@@ -766,7 +767,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] -> 
 				  exit({end_per_group_not_found,TEv});
 			      [_ | RemEvs2] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% end_per_group auto- or user skipped
@@ -813,7 +814,7 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 			      [] ->
 				  exit({unmatched,TEv});
 			      _ ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  Acc
 			  end;
 		     %% start of a sub-group
@@ -866,8 +867,8 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				    _ ->
 					Props = EvProps
 				end,
-				test_server:format("Found ~p!", [InitStart]),
-				test_server:format("Found ~p!", [InitDone]),
+				test_server:format("Found ~tp!", [InitStart]),
+				test_server:format("Found ~tp!", [InitDone]),
 				{TEs,Es};
 			    false ->
 				nomatch
@@ -908,7 +909,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 			      [_TcStart, TcDone={TEH,#event{name=tc_done,
 							    node=Node,
 							    data={M,F,_}}} | Evs3] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  RemSize1 = length(Evs3),
 				  if RemSize1 < RemSize -> 
 					  {[TcDone|Done],Evs3,RemSize1};
@@ -924,7 +925,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				     EH == TEH, EvNode == Node, Mod == M, 
 				     Func == F, result_match(R, Result)] of
 			      [TcDone|_] ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {lists:delete(TcDone, Done),RemEvs,RemSize};
 			      [] ->
 				  exit({unmatched,TEv})
@@ -965,7 +966,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				      _ ->
 					  Props = EvProps1
 				  end,
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% tc_done event for end_per_group
@@ -1009,7 +1010,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				      _ ->
 					  Props = EvProps1
 				  end,				  
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
 		     %% end_per_group auto-or user skipped
@@ -1050,7 +1051,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 			      [] ->
 				  exit({unmatched,TEv});
 			      _ ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  Acc
 			  end;
 		     (TEv={TEH,N,D}, Acc) ->
@@ -1061,7 +1062,7 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 			      [] ->
 				  exit({unmatched,TEv});
 			      _ ->
-				  test_server:format("Found ~p!", [TEv]),
+				  test_server:format("Found ~tp!", [TEv]),
 				  Acc
 			  end;
 		     %% start of a sub-group
@@ -1232,54 +1233,54 @@ result_match(_, _) ->
 
 log_events(TC, Events, EvLogDir, Opts) ->
     LogFile = filename:join(EvLogDir, atom_to_list(TC)++".events"),
-    {ok,Dev} = file:open(LogFile, [write]),
+    {ok,Dev} = file:open(LogFile, [write,{encoding,utf8}]),
     io:format(Dev, "[~n", []),
     log_events1(Events, Dev, " "),
     file:close(Dev),
     FullLogFile = join_abs_dirs(proplists:get_value(net_dir, Opts),
 				LogFile),
-    ct:log("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
+    ct:log("Events written to logfile: <a href=\"file://~ts\">~ts</a>~n",
 	   [FullLogFile,FullLogFile],[no_css]),
-    io:format(user, "Events written to logfile: ~p~n", [LogFile]).
+    io:format(user, "Events written to logfile: ~tp~n", [LogFile]).
 
 log_events1(Evs, Dev, "") ->
     log_events1(Evs, Dev, " ");
 log_events1([E={_EH,tc_start,{_M,{init_per_group,_GrName,Props}}} | Evs], Dev, Ind) ->
     case get_prop(Props) of
 	undefined ->
-	    io:format(Dev, "~s[~p,~n", [Ind,E]),
+	    io:format(Dev, "~s[~tp,~n", [Ind,E]),
 	    log_events1(Evs, Dev, Ind++" ");	    
 	Prop ->
-	    io:format(Dev, "~s{~w,~n~s[~p,~n", [Ind,Prop,Ind++" ",E]),
+	    io:format(Dev, "~s{~w,~n~s[~tp,~n", [Ind,Prop,Ind++" ",E]),
 	    log_events1(Evs, Dev, Ind++"  ")
     end;
 log_events1([E={_EH,tc_done,{_M,{init_per_group,_GrName,_Props},_R}} | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p,~n", [Ind,E]),
+    io:format(Dev, "~s~tp,~n", [Ind,E]),
     log_events1(Evs, Dev, Ind++" ");
 log_events1([E={_EH,tc_start,{_M,{end_per_group,_GrName,_Props}}} | Evs], Dev, Ind) ->
     Ind1 = Ind -- " ",
-    io:format(Dev, "~s~p,~n", [Ind1,E]),
+    io:format(Dev, "~s~tp,~n", [Ind1,E]),
     log_events1(Evs, Dev, Ind1);
 log_events1([E={_EH,tc_done,{_M,{end_per_group,_GrName,Props},_R}} | Evs], Dev, Ind) ->
     case get_prop(Props) of
 	undefined ->
-	    io:format(Dev, "~s~p],~n", [Ind,E]),
+	    io:format(Dev, "~s~tp],~n", [Ind,E]),
 	    log_events1(Evs, Dev, Ind--" ");
 	_Prop ->
-	    io:format(Dev, "~s~p]},~n", [Ind,E]),
+	    io:format(Dev, "~s~tp]},~n", [Ind,E]),
 	    log_events1(Evs, Dev, Ind--"  ")
     end;
 log_events1([E={_EH,tc_auto_skip,{_M,{end_per_group,_GrName},_Reason}} | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p],~n", [Ind,E]),
+    io:format(Dev, "~s~tp],~n", [Ind,E]),
     log_events1(Evs, Dev, Ind--" ");
 log_events1([E={_EH,tc_user_skip,{_M,{end_per_group,_GrName},_Reason}} | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p],~n", [Ind,E]),
+    io:format(Dev, "~s~tp],~n", [Ind,E]),
     log_events1(Evs, Dev, Ind--" ");
 log_events1([E], Dev, Ind) ->
-    io:format(Dev, "~s~p~n].~n", [Ind,E]),
+    io:format(Dev, "~s~tp~n].~n", [Ind,E]),
     ok;
 log_events1([E | Evs], Dev, Ind) ->
-    io:format(Dev, "~s~p,~n", [Ind,E]),
+    io:format(Dev, "~s~tp,~n", [Ind,E]),
     log_events1(Evs, Dev, Ind);
 log_events1([], _Dev, _Ind) ->
     ok.
@@ -1393,10 +1394,10 @@ delete_dirs(LogDir) ->
 delete_dirs(_, []) ->
     ok;
 delete_dirs(LogDir, [Dir | Dirs]) ->
-    test_server:format(0, "Removing old log directory: ~s", [Dir]),
+    test_server:format(0, "Removing old log directory: ~ts", [Dir]),
     case catch rm_rec(Dir) of
 	{_,Reason} ->
-	    test_server:format(0, "Delete failed! (~p)", [Reason]);
+	    test_server:format(0, "Delete failed! (~tp)", [Reason]);
 	ok ->
 	    ok
     end,
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
index fca5ef3eb3..25e8948145 100644
--- a/lib/common_test/test/ct_testspec_1_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -616,7 +616,7 @@ setup_and_execute(TCName, TestSpec, Config) ->
 
     FullSpecFile = ct_test_support:join_abs_dirs(?config(net_dir, Opts),
 						 SpecFile),
-    io:format("~nTest spec created here~n~n<a href=\"file://~s\">~s</a>~n",
+    io:format("~nTest spec created here~n~n<a href=\"file://~ts\">~ts</a>~n",
 	      [FullSpecFile,FullSpecFile]),
 
     ok = ct_test_support:run(Opts, Config),
@@ -638,8 +638,8 @@ setup_and_execute(TCName, TestSpec, Config) ->
 create_spec_file(SpecDir, TCName, TestSpec) ->
     FileName = filename:join(SpecDir,
 			     atom_to_list(TCName)++".spec"),
-    {ok,Dev} = file:open(FileName, [write]),
-    [io:format(Dev, "~p.~n", [Term]) || Term <- TestSpec],
+    {ok,Dev} = file:open(FileName, [write,{encoding,utf8}]),
+    [io:format(Dev, "~tp.~n", [Term]) || Term <- TestSpec],
     file:close(Dev),
     FileName.
 
diff --git a/lib/common_test/test/ct_unicode_SUITE.erl b/lib/common_test/test/ct_unicode_SUITE.erl
new file mode 100644
index 0000000000..84f93a9d0c
--- /dev/null
+++ b/lib/common_test/test/ct_unicode_SUITE.erl
@@ -0,0 +1,218 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_unicode_SUITE
+%%%
+%%% Description:
+%%% Test that common_test handles and logs unicode strings and atoms
+%%% correctly.
+%%%
+%%% The suite used for the test is located in the data directory.
+%%%-------------------------------------------------------------------
+-module(ct_unicode_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    case file:native_name_encoding() of
+        latin1 -> {skip,"Test is not applicable on latin1 file system"};
+        _ ->
+            ct_test_support:init_per_suite([{printable_range,unicode}|Config])
+    end.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [].
+
+all() ->
+    [unicode_atoms_SUITE,
+     unicode_spec].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+unicode_atoms_SUITE(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    run_test(unicode_atoms_SUITE,
+             [{dir,DataDir},{suite,unicode_atoms_SUITE}], Config).
+
+unicode_spec(Config) ->
+    DataDir = ?config(data_dir,Config),
+    PrivDir = ?config(priv_dir,Config),
+    CfgName = "unicode_αβ.cfg",
+    Cfg = io_lib:format("{~tw,[{~tw,\"~ts\"}]}.~n",
+                        ['key_αβ','subkey_αβ',"value_αβ"]),
+    ok = file:write_file(filename:join(PrivDir,CfgName),
+                         unicode:characters_to_binary(Cfg)),
+    TestSpec = [{cases, DataDir, unicode_atoms_SUITE, ['config_αβ']},
+                {config, PrivDir, CfgName}],
+    TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir,
+                                                  "unicode_αβ.spec"),
+    run_test(unicode_spec,[{spec,TestSpecName}],Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+run_test(Label, Test, Config) ->
+    {Opts,ERPid} = setup_env([{label,Label}|Test], Config),
+    ok = ct_test_support:run(Opts, Config),
+    TestEvents = ct_test_support:get_events(ERPid, Config),
+    ct_test_support:log_events(Label,
+			       reformat_events(TestEvents, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+    ExpEvents = events_to_check(Label),
+    ok = ct_test_support:verify_events(ExpEvents, TestEvents, Config),
+    check_logs([_,_]=get_log_dirs(TestEvents)).
+
+setup_env(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}} | Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat_events(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+get_log_dirs([{?eh,#event{name=start_logging,data=LogDir}}|Events]) ->
+    [LogDir|get_log_dirs(Events)];
+get_log_dirs([_|Events]) ->
+    get_log_dirs(Events);
+get_log_dirs([]) ->
+    [].
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(unicode_atoms_SUITE) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,6}},
+     {?eh,tc_start,{unicode_atoms_SUITE,init_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'test_αβ'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'test_αβ',ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_1'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_1','_'}},
+     {?eh,test_stats,{1,1,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_2'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_2','_'}},
+     {?eh,test_stats,{1,2,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_3'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_3','_'}},
+     {?eh,test_stats,{1,3,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'fail_αβ_4'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'fail_αβ_4','_'}},
+     {?eh,test_stats,{1,4,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'skip_αβ'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'skip_αβ','_'}},
+     {?eh,test_stats,{1,4,{1,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,end_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+test_events(unicode_spec) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{unicode_atoms_SUITE,init_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{unicode_atoms_SUITE,'config_αβ'}},
+     {?eh,tc_done,{unicode_atoms_SUITE,'config_αβ',ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{unicode_atoms_SUITE,end_per_suite}},
+     {?eh,tc_done,{unicode_atoms_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
+
+%%%-----------------------------------------------------------------
+%%% Check logs for escaped unicode characters
+check_logs(Dirs) ->
+    ct:log("Checking logs for escaped unicode characters (αβ).~nDirs:~n~tp",
+           [Dirs]),
+    {ok,RE} = re:compile(<<"x{3B[12]}"/utf8>>),
+    case check_logs1(RE,Dirs,[]) of
+        [] ->
+            ok;
+        Match ->
+            MatchStr = string:join(Match,"\n"),
+            ct:log("ERROR: Escaped unicode characters found in:~n~ts",[MatchStr]),
+            ct:fail(escaped_unicode_characters_found)
+    end.
+
+check_logs1(RE,[F|Fs],Match) ->
+    New = case filelib:is_dir(F) of
+              true ->
+                  {ok,Files} = file:list_dir(F),
+                  check_logs1(RE,[filename:join(F,File)||File<-Files],[]);
+              false ->
+                  check_log(RE,F)
+          end,
+    check_logs1(RE,Fs,New++Match);
+check_logs1(_RE,[],Match) ->
+    Match.
+
+check_log(RE,F) ->
+    {ok,Bin} = file:read_file(F),
+    case re:run(Bin,RE,[{capture,none}]) of
+        match ->
+            [F];
+        nomatch ->
+            []
+    end.
diff --git a/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
new file mode 100644
index 0000000000..d4dfdc23ac
--- /dev/null
+++ b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
@@ -0,0 +1,98 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(unicode_atoms_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+groups() ->
+    [].
+
+all() ->
+    ['test_αβ',
+     'fail_αβ_1',
+     'fail_αβ_2',
+     'fail_αβ_3',
+     'fail_αβ_4',
+     'skip_αβ'].
+
+'test_αβ'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    ok.
+
+'fail_αβ_1'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    'α' = 'β',
+    ok.
+
+'fail_αβ_2'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    ct:fail({failing,testcase,?FUNCTION_NAME}),
+    ok.
+
+'fail_αβ_3'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    exit({exiting,testcase,?FUNCTION_NAME}),
+    ok.
+
+'fail_αβ_4'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    S = try throw(ok) catch throw:ok -> erlang:get_stacktrace() end,
+    erlang:raise(error,{error,testcase,?FUNCTION_NAME},S),
+    ok.
+
+'skip_αβ'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    {skip,"Skipping " ++ atom_to_list(?FUNCTION_NAME)}.
+
+
+%% This should not be listed in all/0. It is only to be run explicitly
+%% using a test spec where the config file is declared as well.
+'config_αβ'() ->
+    [{require,'alias_αβ','key_αβ'}].
+'config_αβ'(_Config) ->
+    ct:log("This is test case ~tw",[?FUNCTION_NAME]),
+    Conf = ct:get_config('alias_αβ'),
+    Conf = ct:get_config('key_αβ'),
+    ct:log("Required config: ~tp",[Conf]),
+    ok.
diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl
index b9298e54ca..4dbefabd0d 100644
--- a/lib/common_test/test/ct_verbosity_SUITE.erl
+++ b/lib/common_test/test/ct_verbosity_SUITE.erl
@@ -47,8 +47,8 @@
 init_per_suite(Config) ->
     DataDir = ?config(data_dir, Config),
     EvH = filename:join(DataDir,"simple_evh.erl"),
-    ct:pal("Compiling ~s: ~p", [EvH,compile:file(EvH,[{outdir,DataDir},
-						      debug_info])]),
+    ct:pal("Compiling ~ts: ~p", [EvH,compile:file(EvH,[{outdir,DataDir},
+                                                       debug_info])]),
     ct_test_support:init_per_suite([{path_dirs,[DataDir]} | Config]).
 
 end_per_suite(Config) ->
diff --git a/lib/common_test/test/erl2html2_SUITE.erl b/lib/common_test/test/erl2html2_SUITE.erl
index bdce43c9c9..3a0af14da2 100644
--- a/lib/common_test/test/erl2html2_SUITE.erl
+++ b/lib/common_test/test/erl2html2_SUITE.erl
@@ -163,9 +163,9 @@ convert_module(Mod,InclDirs,Config) ->
     PrivDir = ?config(priv_dir,Config),
     Src = filename:join(DataDir,Mod++".erl"),
     Dst = filename:join(PrivDir,Mod++".erl.html"),
-    io:format("<a href=\"~s\">~s</a>\n",[Src,filename:basename(Src)]),
+    io:format("<a href=\"~ts\">~s</a>\n",[Src,filename:basename(Src)]),
     ok = erl2html2:convert(Src, Dst, InclDirs, "<html><body>"),
-    io:format("<a href=\"~s\">~s</a>\n",[Dst,filename:basename(Dst)]),
+    io:format("<a href=\"~ts\">~s</a>\n",[Dst,filename:basename(Dst)]),
     {Src,Dst}.
 
 %% Check that there are the same number of lines in each file, and
diff --git a/lib/common_test/test/test_server_test_lib.erl b/lib/common_test/test/test_server_test_lib.erl
index cf5951ae03..6c8e98bd12 100644
--- a/lib/common_test/test/test_server_test_lib.erl
+++ b/lib/common_test/test/test_server_test_lib.erl
@@ -81,7 +81,7 @@ prepare_tester_node(Node,Config) ->
     [true = rpc:call(Node, code, add_patha, [D]) || D <- PathDirs],
     io:format("Dirs added to code path (on ~w):~n",
 	      [Node]),
-    [io:format("~s~n", [D]) || D <- PathDirs],
+    [io:format("~ts~n", [D]) || D <- PathDirs],
 
     true = rpc:call(Node, os, putenv,
 		    ["TEST_SERVER_FRAMEWORK", "undefined"]),
diff --git a/lib/common_test/test_server/ts_install.erl b/lib/common_test/test_server/ts_install.erl
index 5734bd0787..b78258227c 100644
--- a/lib/common_test/test_server/ts_install.erl
+++ b/lib/common_test/test_server/ts_install.erl
@@ -136,7 +136,7 @@ unix_autoconf(XConf) ->
 	true ->
 	    OSXEnv = macosx_cflags(),
 	    UnQuotedEnv = assign_vars(unquote(Env++OSXEnv)),
-	    io:format("Running ~s~nEnv: ~p~n",
+	    io:format("Running ~ts~nEnv: ~p~n",
 		      [lists:flatten(Configure ++ Args),UnQuotedEnv]),
 	    Port = open_port({spawn, lists:flatten(["\"",Configure,"\"",Args])},
 			     [stream, eof, {env,UnQuotedEnv}]),
diff --git a/lib/common_test/test_server/ts_make.erl b/lib/common_test/test_server/ts_make.erl
index 456e913c39..9284a0db33 100644
--- a/lib/common_test/test_server/ts_make.erl
+++ b/lib/common_test/test_server/ts_make.erl
@@ -42,7 +42,7 @@ unmake(Config) when is_list(Config) ->
 
 make(Make, Dir, Makefile) ->
     {RunFile, RunCmd, Script} = run_make_script(os:type(), Make, Dir, Makefile),
-    case file:write_file(RunFile, Script) of
+    case file:write_file(RunFile, unicode:characters_to_binary(Script)) of
 	ok ->
 	    Log = filename:join(Dir, "make.log"),
 	    file:delete(Log),