Merge branch 'siri/cuddle-master'

* siri/cuddle-master:
  Change ct:sleep to timer:sleep where scaling is not wanted
  Don't generate ssh key files in netconf client test
  Ignore data received in break mode in test telnet_server
  Wait for process to die before next call
  Retry ct_telnet:get_data if no data is received after short wait
  Don't throw rest of line when NOP is received in test telnet_server
  Change ct:sleep to timer:sleep in telnet_server

9 files changed, 188 insertions, 322 deletions

diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
index c64774cd4f..0b3f834732 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
@@ -74,7 +74,7 @@ test_get_known_variable(_)->
 test_localtime_update(_)->
     Seconds = 5,
     LT1 = ct:get_config(localtime),
-    ct:sleep(Seconds*1000),
+    timer:sleep(Seconds*1000), % don't want scaling of this timer
     LT2 = ct:reload_config(localtime),
     case is_diff_ok(LT1, LT2, Seconds) of
 	{false, Actual, Exp}->
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 065639dd36..f34969683c 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -123,41 +123,37 @@ init_per_testcase(_Case, Config) ->
 end_per_testcase(_Case, _Config) ->
     ok.
 
-init_per_suite() ->
-    [{timetrap,2*?default_timeout}]. % making dsa files can be slow
 init_per_suite(Config) ->
     case catch ssh:start() of
 	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("ssh started",[]),
-	    {ok, _} =  netconfc_test_lib:get_id_keys(Config),
-	    netconfc_test_lib:make_dsa_files(Config),
-	    ct:log("dsa files created",[]),
-	    Server = ?NS:start(?config(data_dir,Config)),
+	    SshDir = filename:join(filename:dirname(code:which(?MODULE)),
+				   "ssh_dir"),
+	    Server = ?NS:start(SshDir),
 	    ct:log("netconf server started",[]),
-	    [{server,Server}|Config];
+	    [{netconf_server,Server},{ssh_dir,SshDir}|Config];
 	Other ->
 	    ct:log("could not start ssh: ~p",[Other]),
 	    {skip, "SSH could not be started!"}
     end.
 
 end_per_suite(Config) ->
-    ?NS:stop(?config(server,Config)),
+    ?NS:stop(?config(netconf_server,Config)),
     ssh:stop(),
     crypto:stop(),
-    netconfc_test_lib:remove_id_keys(Config),
     Config.
 
 hello(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
 hello_from_server_first(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     ?NS:hello(1),
-    {ok,Client} = ct_netconfc:only_open(?DEFAULT_SSH_OPTS(DataDir)),
+    {ok,Client} = ct_netconfc:only_open(?DEFAULT_SSH_OPTS(SshDir)),
     ct:sleep(500),
     ?NS:expect(hello),
     ?ok = ct_netconfc:hello(Client, [{capability, ["urn:com:ericsson:ebase:1.1.0"]}], infinity),
@@ -166,8 +162,8 @@ hello_from_server_first(Config) ->
     ok.
 
 hello_named(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(any_name,DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(any_name,SshDir),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
     ok.
@@ -175,8 +171,8 @@ hello_named(Config) ->
 hello_configured() ->
     [{require, netconf1}].
 hello_configured(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_configured_success(netconf1,DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_configured_success(netconf1,SshDir),
     ?NS:expect_do_reply('close-session',close,ok),
     {error, {no_such_name,netconf1}} = ct_netconfc:close_session(netconf1),
     ?ok = ct_netconfc:close_session(Client),
@@ -185,10 +181,10 @@ hello_configured(Config) ->
 hello_configured_extraopts() ->
     [{require, netconf1}].
 hello_configured_extraopts(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     %% Test that the cofiguration overwrites the ExtraOpts parameter
     %% to ct_netconfc:open/2.
-    {ok,Client} = open_configured_success(netconf1,DataDir,[{password,"faulty"}]),
+    {ok,Client} = open_configured_success(netconf1,SshDir,[{password,"faulty"}]),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
     ok.
@@ -196,8 +192,8 @@ hello_configured_extraopts(Config) ->
 hello_required() ->
     [{require, my_named_connection, netconf1}].
 hello_required(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,_Client} = open_configured_success(my_named_connection,DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,_Client} = open_configured_success(my_named_connection,SshDir),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(my_named_connection),
     ok.
@@ -205,69 +201,69 @@ hello_required(Config) ->
 hello_required_exists() ->
     [{require, my_named_connection, netconf1}].
 hello_required_exists(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,_Client1} = open_configured_success(my_named_connection,DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,_Client1} = open_configured_success(my_named_connection,SshDir),
 
     %% Check that same name can not be used twice
     {error,{connection_exists,_Client1}} =
-	ct_netconfc:open(my_named_connection,[{user_dir,DataDir}]),
+	ct_netconfc:open(my_named_connection,[{user_dir,SshDir}]),
 
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(my_named_connection),
     ct:sleep(500),
 
     %% Then check that it can be used again after the first is closed
-    {ok,_Client2} = open_configured_success(my_named_connection,DataDir),
+    {ok,_Client2} = open_configured_success(my_named_connection,SshDir),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(my_named_connection),
     ok.
 
 hello_global_pwd(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir,[{user,"any-user"},
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir,[{user,"any-user"},
 					{password,"global-xxx"}]),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
 hello_no_session_id(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     ?NS:hello(no_session_id),
     ?NS:expect(no_session_id,hello),
-    {error,{incorrect_hello,no_session_id_found}} = open(DataDir),
+    {error,{incorrect_hello,no_session_id_found}} = open(SshDir),
     ok.
 
 hello_incomp_base_vsn(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     ?NS:hello(1,{base,"1.1"}),
     ?NS:expect(hello),
-    {error,{incompatible_base_capability_vsn,"1.1"}} = open(DataDir),
+    {error,{incompatible_base_capability_vsn,"1.1"}} = open(SshDir),
     ok.
 
 hello_no_base_cap(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     ?NS:hello(1,no_base),
     ?NS:expect(hello),
-    {error,{incorrect_hello,no_base_capability_found}} = open(DataDir),
+    {error,{incorrect_hello,no_base_capability_found}} = open(SshDir),
     ok.
 
 hello_no_caps(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     ?NS:hello(1,no_caps),
     ?NS:expect(hello),
-    {error,{incorrect_hello,capabilities_not_found}} = open(DataDir),
+    {error,{incorrect_hello,capabilities_not_found}} = open(SshDir),
     ok.
 
 no_server_hello(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     ?NS:expect(undefined,hello),
-    {error,{hello_session_failed,timeout}} = open(DataDir,[{timeout,2000}]),
+    {error,{hello_session_failed,timeout}} = open(SshDir,[{timeout,2000}]),
     ok.
 
 no_client_hello(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     ?NS:hello(1),
-    {ok,Client} = ct_netconfc:only_open(?DEFAULT_SSH_OPTS(DataDir)),
+    {ok,Client} = ct_netconfc:only_open(?DEFAULT_SSH_OPTS(SshDir)),
 
     %% Allow server hello to arrive
     ct:sleep(500),
@@ -280,8 +276,8 @@ no_client_hello(Config) ->
     ok.
 
 get_session_id(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     1 = ct_netconfc:get_session_id(Client),
 
@@ -290,8 +286,8 @@ get_session_id(Config) ->
     ok.
 
 get_capabilities(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     Caps = ct_netconfc:get_capabilities(Client),
     BaseCap = ?NETCONF_BASE_CAP ++ ?NETCONF_BASE_CAP_VSN,
@@ -302,49 +298,49 @@ get_capabilities(Config) ->
     ok.
 
 faulty_user(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     {error,{ssh,could_not_connect_to_server,
 	    "Unable to connect using the available authentication methods"}} =
-	open(DataDir,[{user,"yyy"}]),
+	open(SshDir,[{user,"yyy"}]),
     ok.
 
 faulty_passwd(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     {error,{ssh,could_not_connect_to_server,
 	    "Unable to connect using the available authentication methods"}} =
-	open(DataDir,[{password,"yyy"}]),
+	open(SshDir,[{password,"yyy"}]),
     ok.
 
 faulty_port(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
     {error,{ssh,could_not_connect_to_server,econnrefused}} =
-	open(DataDir,[{port,2062}]),
+	open(SshDir,[{port,2062}]),
     ok.
 
 no_host(Config) ->
-    DataDir = ?config(data_dir,Config),
-    Opts = lists:keydelete(ssh,1,?DEFAULT_SSH_OPTS(DataDir)),
+    SshDir = ?config(ssh_dir,Config),
+    Opts = lists:keydelete(ssh,1,?DEFAULT_SSH_OPTS(SshDir)),
     {error,no_host_address} = ct_netconfc:open(Opts),
     ok.
 
 no_port(Config) ->
-    DataDir = ?config(data_dir,Config),
-    Opts = lists:keydelete(port,1,?DEFAULT_SSH_OPTS(DataDir)),
+    SshDir = ?config(ssh_dir,Config),
+    Opts = lists:keydelete(port,1,?DEFAULT_SSH_OPTS(SshDir)),
     {error,no_port} = ct_netconfc:open(Opts),
     ok.
 
 invalid_opt(Config) ->
-    DataDir = ?config(data_dir,Config),
-    Opts1 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{timeout,invalidvalue}],
+    SshDir = ?config(ssh_dir,Config),
+    Opts1 = ?DEFAULT_SSH_OPTS(SshDir) ++ [{timeout,invalidvalue}],
     {error,{invalid_option,{timeout,invalidvalue}}} = ct_netconfc:open(Opts1),
-    Opts2 = ?DEFAULT_SSH_OPTS(DataDir) ++ [{some_other_opt,true}],
+    Opts2 = ?DEFAULT_SSH_OPTS(SshDir) ++ [{some_other_opt,true}],
     {error,{ssh,could_not_connect_to_server,{options,_}}} =
 	ct_netconfc:open(Opts2),
     ok.
 
 timeout_close_session(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect('close-session'),
     true = erlang:is_process_alive(Client),
     {error,timeout} = ct_netconfc:close_session(Client,1000),
@@ -352,8 +348,8 @@ timeout_close_session(Config) ->
     ok.
 
 get(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
     ?NS:expect_reply('get',{data,Data}),
     {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
@@ -362,8 +358,8 @@ get(Config) ->
     ok.
 
 get_a_lot(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Descr = lists:append(lists:duplicate(1000,"Description of myserver! ")),
     Server = {server,[{xmlns,"myns"}],[{name,[],["myserver"]},
 				       {description,[],[Descr]}]},
@@ -375,8 +371,8 @@ get_a_lot(Config) ->
     ok.
 
 timeout_get(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect('get'),
     {error,timeout} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]},1000),
     ?NS:expect_do_reply('close-session',close,ok),
@@ -392,8 +388,8 @@ timeout_get(Config) ->
 %% Note that we can only hope that the test case triggers the problem
 %% every now and then, as it is very timing dependent...
 flush_timeout_get(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
     ?NS:expect_reply('get',{data,Data}),
     timer:sleep(1000),
@@ -406,8 +402,8 @@ flush_timeout_get(Config) ->
     ok.
 
 get_xpath(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
     ?NS:expect_reply({'get',xpath},{data,Data}),
     {ok,Data} = ct_netconfc:get(Client,{xpath,"/server"}),
@@ -416,8 +412,8 @@ get_xpath(Config) ->
     ok.
 
 get_config(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
     ?NS:expect_reply('get-config',{data,Data}),
     {ok,Data} = ct_netconfc:get_config(Client,running,
@@ -427,8 +423,8 @@ get_config(Config) ->
     ok.
 
 get_config_xpath(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
     ?NS:expect_reply({'get-config',xpath},{data,Data}),
     {ok,Data} = ct_netconfc:get_config(Client,running,{xpath,"/server"}),
@@ -437,8 +433,8 @@ get_config_xpath(Config) ->
     ok.
 
 edit_config(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply('edit-config',ok),
     ?ok = ct_netconfc:edit_config(Client,running,
 				  {server,[{xmlns,"myns"}],
@@ -448,8 +444,8 @@ edit_config(Config) ->
     ok.
 
 edit_config_opt_params(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply({'edit-config',{'default-operation',"none"}},ok),
     ?ok = ct_netconfc:edit_config(Client,running,
 				  {server,[{xmlns,"myns"}],
@@ -460,8 +456,8 @@ edit_config_opt_params(Config) ->
     ok.
 
 copy_config(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply('copy-config',ok),
     ?ok = ct_netconfc:copy_config(Client,startup,running),
     ?NS:expect_do_reply('close-session',close,ok),
@@ -469,8 +465,8 @@ copy_config(Config) ->
     ok.
 
 delete_config(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply('delete-config',ok),
     ?ok = ct_netconfc:delete_config(Client,startup),
     ?NS:expect_do_reply('close-session',close,ok),
@@ -478,8 +474,8 @@ delete_config(Config) ->
     ok.
 
 lock(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply('lock',ok),
     ?ok = ct_netconfc:lock(Client,running),
     ?NS:expect_do_reply('close-session',close,ok),
@@ -487,8 +483,8 @@ lock(Config) ->
     ok.
 
 unlock(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply('unlock',ok),
     ?ok = ct_netconfc:unlock(Client,running),
     ?NS:expect_do_reply('close-session',close,ok),
@@ -496,12 +492,12 @@ unlock(Config) ->
     ok.
 
 kill_session(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     ?NS:hello(2),
     ?NS:expect(2,hello),
-    {ok,_OtherClient} = open(DataDir),
+    {ok,_OtherClient} = open(SshDir),
 
     ?NS:expect_do_reply('kill-session',{kill,2},ok),
     ?ok = ct_netconfc:kill_session(Client,2),
@@ -512,8 +508,8 @@ kill_session(Config) ->
     ok.
 
 get_no_such_client(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
@@ -529,8 +525,8 @@ get_no_such_client(Config) ->
     ok.
 
 action(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Data = [{myactionreturn,[{xmlns,"myns"}],["value"]}],
     %% test either to receive {data,Data} or {ok,Data},
     %% both need to be handled
@@ -549,8 +545,8 @@ action(Config) ->
     ok.
 
 send_any_rpc(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
     GetConf = {'get-config',
 	       [{source,["running"]},
@@ -571,8 +567,8 @@ send_any_rpc(Config) ->
     ok.
 
 send_any(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     %% Correct get-config rpc
     Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
@@ -604,8 +600,8 @@ send_any(Config) ->
     ok.
 
 hide_password(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     Password = "my_very_secret_password",
     Data = [{passwords,[{xmlns,"myns"}],
 	     [{password,[{xmlns,"pwdns"}],[Password]},
@@ -633,8 +629,8 @@ hide_password(Config) ->
     ok.
 
 not_proper_xml(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     NS = list_to_binary(?NETCONF_NAMESPACE),
     NotProper = <<"<rpc-reply message-id=\"1\" xmlns=\"",
 		  NS/binary,"\"><data></rpc-reply>">>,
@@ -646,8 +642,8 @@ not_proper_xml(Config) ->
     ok.
 
 prefixed_namespace(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     NS = list_to_binary(?NETCONF_NAMESPACE),
 
     %% Test that data element can be properly decoded and that
@@ -679,8 +675,8 @@ prefixed_namespace(Config) ->
 %% i.e. when the complete rpc-reply is not contained in one single ssh
 %% data message.
 receive_chunked_data(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     %% Construct the data to return from netconf server
     Data = [{servers,[{xmlns,"myns"}],
@@ -727,8 +723,8 @@ receive_chunked_data(Config) ->
 
 %% Same as receive_chunked_data, but timeout waiting for last part.
 timeout_receive_chunked_data(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     %% Construct the data to return from netconf server
     Data = [{servers,[{xmlns,"myns"}],
@@ -773,8 +769,8 @@ timeout_receive_chunked_data(Config) ->
 
 %% Same as receive_chunked_data, but close while waiting for last part.
 close_while_waiting_for_chunked_data(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     %% Construct the data to return from netconf server
     Data = [{servers,[{xmlns,"myns"}],
@@ -816,8 +812,8 @@ close_while_waiting_for_chunked_data(Config) ->
     ok.
 
 connection_crash(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     %% Test that if the test survives killing the connection
     %% process. Earlier this caused ct_util_server to terminate, and
@@ -828,8 +824,8 @@ connection_crash(Config) ->
     ok.
 
 get_event_streams(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     StreamNames = ["NETCONF","stream1","stream2"],
     Streams = [{N,[{description,"descr of " ++ N}]} || N <- StreamNames],
     StreamsXml = [{stream,[{name,[N]}|[{Tag,[Value]} || {Tag,Value} <- Data]]}
@@ -849,31 +845,31 @@ get_event_streams(Config) ->
     ok.
 
 create_subscription(Config) ->
-    DataDir = ?config(data_dir,Config),
+    SshDir = ?config(ssh_dir,Config),
 
     %% All defaults
-    {ok,Client1} = open_success(DataDir),
+    {ok,Client1} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     ?ok = ct_netconfc:create_subscription(Client1),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client1),
 
     %% All defaults with timeout
-    {ok,Client1a} = open_success(DataDir),
+    {ok,Client1a} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     ?ok = ct_netconfc:create_subscription(Client1a,5000),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client1a),
 
     %% All defaults timing out
-    {ok,Client1b} = open_success(DataDir),
+    {ok,Client1b} = open_success(SshDir),
     ?NS:expect({'create-subscription',[stream]}),
     {error,timeout} = ct_netconfc:create_subscription(Client1b,100),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client1b),
 
     %% Stream
-    {ok,Client2} = open_success(DataDir),
+    {ok,Client2} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     Stream = "some_stream",
     ?ok = ct_netconfc:create_subscription(Client2,Stream),
@@ -881,7 +877,7 @@ create_subscription(Config) ->
     ?ok = ct_netconfc:close_session(Client2),
 
     %% Filter
-    {ok,Client3} = open_success(DataDir),
+    {ok,Client3} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
     Filter = {notification,?NETMOD_NOTIF_NAMESPACE_ATTR,
 	      [eventTime]},
@@ -890,28 +886,28 @@ create_subscription(Config) ->
     ?ok = ct_netconfc:close_session(Client3),
 
     %% Filter with timeout
-    {ok,Client3a} = open_success(DataDir),
+    {ok,Client3a} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
     ?ok = ct_netconfc:create_subscription(Client3a,Filter,5000),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client3a),
 
     %% Filter timing out
-    {ok,Client3b} = open_success(DataDir),
+    {ok,Client3b} = open_success(SshDir),
     ?NS:expect({'create-subscription',[stream,filter]}),
     {error,timeout}=ct_netconfc:create_subscription(Client3b,Filter,100),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client3b),
 
     %% Stream and filter
-    {ok,Client4} = open_success(DataDir),
+    {ok,Client4} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
     ?ok = ct_netconfc:create_subscription(Client4,Stream,Filter),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client4),
 
     %% Start/stop time
-    {ok,Client5} = open_success(DataDir),
+    {ok,Client5} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,startTime,stopTime]},ok),
     StartTime = xs_datetime({D,{H,M,S}}= calendar:local_time()),
     StopTime = xs_datetime({D,{H+2,M,S}}),
@@ -920,14 +916,14 @@ create_subscription(Config) ->
     ?ok = ct_netconfc:close_session(Client5),
 
     %% Start/stop time with timeout
-    {ok,Client5a} = open_success(DataDir),
+    {ok,Client5a} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,startTime,stopTime]},ok),
     ?ok = ct_netconfc:create_subscription(Client5a,StartTime,StopTime,5000),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client5a),
 
     %% Start/stop time timing out
-    {ok,Client5b} = open_success(DataDir),
+    {ok,Client5b} = open_success(SshDir),
     ?NS:expect({'create-subscription',[stream,startTime,stopTime]}),
     {error,timeout} =
 	ct_netconfc:create_subscription(Client5b,StartTime,StopTime,100),
@@ -935,14 +931,14 @@ create_subscription(Config) ->
     ?ok = ct_netconfc:close_session(Client5b),
 
     %% Stream and start/stop time
-    {ok,Client6} = open_success(DataDir),
+    {ok,Client6} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,startTime,stopTime]},ok),
     ?ok = ct_netconfc:create_subscription(Client6,Stream,StartTime,StopTime),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client6),
 
     %% Filter and start/stop time
-    {ok,Client7} = open_success(DataDir),
+    {ok,Client7} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,filter,startTime,stopTime]},
 		    ok),
     ?ok = ct_netconfc:create_subscription(Client7,Filter,
@@ -951,7 +947,7 @@ create_subscription(Config) ->
     ?ok = ct_netconfc:close_session(Client7),
 
     %% Stream, filter and start/stop time
-    {ok,Client8} = open_success(DataDir),
+    {ok,Client8} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,filter,startTime,stopTime]},
 		    ok),
     ?ok = ct_netconfc:create_subscription(Client8,Stream,Filter,
@@ -960,7 +956,7 @@ create_subscription(Config) ->
     ?ok = ct_netconfc:close_session(Client8),
 
     %% Multiple filters
-    {ok,Client9} = open_success(DataDir),
+    {ok,Client9} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
     MultiFilters = [{event,[{xmlns,"http://my.namespaces.com/event"}],
 		     [{eventClass,["fault"]},
@@ -975,8 +971,8 @@ create_subscription(Config) ->
     ok.
 
 receive_one_event(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     ?ok = ct_netconfc:create_subscription(Client),
 
@@ -1002,8 +998,8 @@ receive_one_event(Config) ->
     ok.
 
 receive_multiple_events(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     ?ok = ct_netconfc:create_subscription(Client),
 
@@ -1043,8 +1039,8 @@ receive_multiple_events(Config) ->
     ok.
 
 receive_event_and_rpc(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     ?ok = ct_netconfc:create_subscription(Client),
@@ -1103,8 +1099,8 @@ receive_event_and_rpc(Config) ->
 
 
 receive_event_and_rpc_in_chunks(Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(DataDir),
+    SshDir = ?config(ssh_dir,Config),
+    {ok,Client} = open_success(SshDir),
 
     ?NS:expect_reply({'create-subscription',[stream]},ok),
     ?ok = ct_netconfc:create_subscription(Client),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
index 04bfe75187..0a49cdabbb 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
@@ -51,7 +51,7 @@ init_per_testcase(Case, Config) ->
     stop_node(Case),
     Config.
 
-end_per_testcase(Case, Config) ->
+end_per_testcase(Case, _Config) ->
     stop_node(Case),
     ok.
 
@@ -61,16 +61,13 @@ stop_node(Case) ->
     rpc:call(Node,erlang,halt,[]).
 
 
-init_per_suite() ->
-    [{timetrap,2*?default_timeout}]. % making dsa files can be slow
 init_per_suite(Config) ->
     case ssh:start() of
 	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("SSH started locally",[]),
-	    {ok, _} =  netconfc_test_lib:get_id_keys(Config),
-	    netconfc_test_lib:make_dsa_files(Config),
-	    ct:log("dsa files created",[]),
-	    Config;
+	    SshDir = filename:join(filename:dirname(code:which(?MODULE)),
+				   "ssh_dir"),
+	    [{ssh_dir,SshDir}|Config];
 	Other ->
 	    ct:log("could not start ssh locally: ~p",[Other]),
 	    {skip, "SSH could not be started locally!"}
@@ -79,7 +76,6 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     ssh:stop(),
     crypto:stop(),
-    netconfc_test_lib:remove_id_keys(Config),
     Config.
 
 %% This test case is related to seq12645
@@ -93,7 +89,7 @@ remote_crash(Config) ->
     case rpc:call(Node,ssh,start,[]) of
 	Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("SSH started remote",[]),
-	    Server = rpc:call(Node,?NS,start,[?config(data_dir,Config)]),
+	    ns(Node,start,[?config(ssh_dir,Config)]),
 	    ct:log("netconf server started remote",[]),
 	    remote_crash(Node,Config);
 	Other ->
@@ -102,8 +98,7 @@ remote_crash(Config) ->
     end.
 
 remote_crash(Node,Config) ->
-    DataDir = ?config(data_dir,Config),
-    {ok,Client} = open_success(Node,DataDir),
+    {ok,Client} = open_success(Node,?config(ssh_dir,Config)),
 
     ns(Node,expect_reply,[{'create-subscription',[stream]},ok]),
     ?ok = ct_netconfc:create_subscription(Client),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_test_lib.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_test_lib.erl
deleted file mode 100644
index e058bc7600..0000000000
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_test_lib.erl
+++ /dev/null
@@ -1,166 +0,0 @@
--module(netconfc_test_lib).
-
--export([get_id_keys/1, remove_id_keys/1, make_dsa_files/1]).
--include_lib("common_test/include/ct.hrl").
--include_lib("public_key/include/public_key.hrl").
-
-%%%-----------------------------------------------------------------
-%%% BEGIN SSH key management
-%% copy private keys to given dir from ~/.ssh
-get_id_keys(Config) ->
-    DstDir = ?config(priv_dir, Config),
-    SrcDir = filename:join(os:getenv("HOME"), ".ssh"),
-    RsaOk = copyfile(SrcDir, DstDir, "id_rsa"),
-    DsaOk = copyfile(SrcDir, DstDir, "id_dsa"),
-    case {RsaOk, DsaOk} of
-	{{ok, _}, {ok, _}} -> {ok, both};
-	{{ok, _}, _} -> {ok, rsa};
-	{_, {ok, _}} -> {ok, dsa};
-	{Error, _} -> Error
-    end.
-
-%% Remove later on. Use make_dsa_files instead.
-remove_id_keys(Config) ->
-    Dir = ?config(priv_dir, Config),
-    file:delete(filename:join(Dir, "id_rsa")),
-    file:delete(filename:join(Dir, "id_dsa")).
-
-
-make_dsa_files(Config) ->
-    make_dsa_files(Config, rfc4716_public_key).
-make_dsa_files(Config, Type) ->
-    {DSA, EncodedKey} = gen_dsa(128, 20),
-    PKey = DSA#'DSAPrivateKey'.y,
-    P = DSA#'DSAPrivateKey'.p,
-    Q = DSA#'DSAPrivateKey'.q,
-    G = DSA#'DSAPrivateKey'.g,
-    Dss = #'Dss-Parms'{p=P, q=Q, g=G},
-    {ok, Hostname} = inet:gethostname(),
-    {ok, {A, B, C, D}} = inet:getaddr(Hostname, inet),
-    IP = lists:concat([A, ".", B, ".", C, ".", D]),
-    Attributes = [], % Could be [{comment,"user@" ++ Hostname}],
-    HostNames = [{hostnames,[IP, IP]}],
-    PublicKey = [{{PKey, Dss}, Attributes}],
-    KnownHosts = [{{PKey, Dss}, HostNames}],
-
-    KnownHostsEnc = public_key:ssh_encode(KnownHosts, known_hosts),
-    KnownHosts = public_key:ssh_decode(KnownHostsEnc, known_hosts),
-
-    PublicKeyEnc = public_key:ssh_encode(PublicKey, Type),
-
-    SystemTmpDir = ?config(data_dir, Config),
-    filelib:ensure_dir(SystemTmpDir),
-    file:make_dir(SystemTmpDir),
-
-    DSAFile = filename:join(SystemTmpDir, "ssh_host_dsa_key.pub"),
-    file:delete(DSAFile),
-
-    DSAPrivateFile  = filename:join(SystemTmpDir, "ssh_host_dsa_key"),
-    file:delete(DSAPrivateFile),
-
-    KHFile = filename:join(SystemTmpDir, "known_hosts"),
-    file:delete(KHFile),
-
-    PemBin = public_key:pem_encode([EncodedKey]),
-
-    file:write_file(DSAFile, PublicKeyEnc),
-    file:write_file(KHFile, KnownHostsEnc),
-    file:write_file(DSAPrivateFile, PemBin),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% @doc Creates a dsa key (OBS: for testing only)
-%%   the sizes are in bytes
-%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
-%% @end
-%%--------------------------------------------------------------------
-gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
-    Key = gen_dsa2(LSize, NSize),
-    {Key, encode_key(Key)}.
-
-encode_key(Key = #'DSAPrivateKey'{}) ->
-    Der = public_key:der_encode('DSAPrivateKey', Key),
-    {'DSAPrivateKey', Der, not_encrypted}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% DSA key generation  (OBS: for testing only)
-%% See http://en.wikipedia.org/wiki/Digital_Signature_Algorithm
-%% and the fips_186-3.pdf
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-gen_dsa2(LSize, NSize) ->
-    Q  = prime(NSize),  %% Choose N-bit prime Q
-    X0 = prime(LSize),
-    P0 = prime((LSize div 2) +1),
-    
-    %% Choose L-bit prime modulus P such that p-1 is a multiple of q.
-    case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
-	error -> 
-	    gen_dsa2(LSize, NSize);
-	P ->	    
-	    G = crypto:mod_pow(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
-	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
-	    
-	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
-	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
-	    
-	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
-			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
-    end.
-    
-%% See fips_186-3.pdf
-dsa_search(T, P0, Q, Iter) when Iter > 0 ->
-    P = 2*T*Q*P0 + 1,
-    case is_prime(P, 50) of
-	true -> P;
-	false -> dsa_search(T+1, P0, Q, Iter-1)
-    end;
-dsa_search(_,_,_,_) -> 
-    error.
-
-
-%%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-prime(ByteSize) ->
-    Rand = odd_rand(ByteSize),
-    prime_odd(Rand, 0).
-
-prime_odd(Rand, N) ->
-    case is_prime(Rand, 50) of
-	true -> 
-	    Rand;
-	false -> 
-	    prime_odd(Rand+2, N+1)
-    end.
-
-%% see http://en.wikipedia.org/wiki/Fermat_primality_test
-is_prime(_, 0) -> true;
-is_prime(Candidate, Test) -> 
-    CoPrime = odd_rand(10000, Candidate),
-    Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
-    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
-
-is_prime(CoPrime, CoPrime, Candidate, Test) ->
-    is_prime(Candidate, Test-1);
-is_prime(_,_,_,_) ->
-    false.
-
-odd_rand(Size) ->
-    Min = 1 bsl (Size*8-1),
-    Max = (1 bsl (Size*8))-1,
-    odd_rand(Min, Max).
-
-odd_rand(Min,Max) ->
-    Rand = crypto:rand_uniform(Min,Max),
-    case Rand rem 2 of
-	0 -> 
-	    Rand + 1;
-	_ -> 
-	    Rand
-    end.
-
-copyfile(SrcDir, DstDir, Fn) ->
-    file:copy(filename:join(SrcDir, Fn),
-	      filename:join(DstDir, Fn)).
-
-%%% END SSH key management
-%%%-----------------------------------------------------------------
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ssh_dir/ssh_host_dsa_key b/lib/common_test/test/ct_netconfc_SUITE_data/ssh_dir/ssh_host_dsa_key
new file mode 100644
index 0000000000..4ee0b8657e
--- /dev/null
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ssh_dir/ssh_host_dsa_key
@@ -0,0 +1,13 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvQIBAAKBgQDuGhXsDoUC/x98Q1KEgdf+pQjzBXFu0gMf6C2P47FILALVjvzt
+HvpXarT8Y0XZb4/i5XndcKazmRArEVmPzRT0Pp7gSJpOclY/f1YrplvtMjeQaZ/Y
+eD5JoQFpgIUduiifdRRt0r5gXYejCfACa+ZSFiXTvI+ZXpHC7rH+qRCRdwIVAL6Z
+VUd15Rm/C4NrLD/nIL8tnnE3AoGBAOo9qlMBtN1MdmvJZ+Pa/x8O5+VxQvAVNysb
+DDIZQtT58ko5r3sRA783zHtUft80FA8pUAhkrnRKnqn+bK42Xrm/IMXJd8Wi9LBy
+pN5Pg37B/k6pXs2qzLDYnCCBEW9EBBUn6fyZMK7DDs/BTU7Rf0dCh1/YsxRrm0yJ
+reFOd+1gAoGBAJTq0lPrrUB62NXllTbVNAusIQX870BHBHuo3K3OFYGYD85z1gwy
+e495snKyYOT9QfkBiuH/VGxP2BgIQH+cr5hTWsFZ/09mdhEC5sj/bVDrhwexklVx
+ZeHxpIVmpB97jXomdXVR2ZoP92Gco+qU8tXcBdopQQcybk5j4fUxa+KQAhUAmGWZ
+bHhbiRb/ip5oN6edhUe47TU=
+-----END DSA PRIVATE KEY-----
+
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ssh_dir/ssh_host_dsa_key.pub b/lib/common_test/test/ct_netconfc_SUITE_data/ssh_dir/ssh_host_dsa_key.pub
new file mode 100644
index 0000000000..bca37299b0
--- /dev/null
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ssh_dir/ssh_host_dsa_key.pub
@@ -0,0 +1,11 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1kc3MAAACBAO4aFewOhQL/H3xDUoSB1/6lCPMFcW7SAx/oLY/jsUgsAtWO
+/O0e+ldqtPxjRdlvj+Lled1wprOZECsRWY/NFPQ+nuBImk5yVj9/ViumW+0yN5Bpn9h4
+PkmhAWmAhR26KJ91FG3SvmBdh6MJ8AJr5lIWJdO8j5lekcLusf6pEJF3AAAAFQC+mVVH
+deUZvwuDayw/5yC/LZ5xNwAAAIEA6j2qUwG03Ux2a8ln49r/Hw7n5XFC8BU3KxsMMhlC
+1PnySjmvexEDvzfMe1R+3zQUDylQCGSudEqeqf5srjZeub8gxcl3xaL0sHKk3k+DfsH+
+TqlezarMsNicIIERb0QEFSfp/JkwrsMOz8FNTtF/R0KHX9izFGubTImt4U537WAAAACB
+AJTq0lPrrUB62NXllTbVNAusIQX870BHBHuo3K3OFYGYD85z1gwye495snKyYOT9QfkB
+iuH/VGxP2BgIQH+cr5hTWsFZ/09mdhEC5sj/bVDrhwexklVxZeHxpIVmpB97jXomdXVR
+2ZoP92Gco+qU8tXcBdopQQcybk5j4fUxa+KQ
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
index 9dc9095f47..985fa40ad2 100644
--- a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
@@ -308,8 +308,19 @@ large_string(_) ->
     VerifyStr = [C || C <- lists:flatten(Data1), C/=$ , C/=$\r, C/=$\n, C/=$>],
 
     ok = ct_telnet:send(Handle, "echo_sep "++BigString),
-    ct:sleep(50),
-    {ok,Data2} = ct_telnet:get_data(Handle),
+    %% On some slow machines, 50 ms might not be enough to get the
+    %% first packet of data. We will therefore keep trying for a
+    %% second before we give up this...
+    F = fun RepeatUntilData(N) ->
+		ct:sleep(50),
+		case ct_telnet:get_data(Handle) of
+		    {ok,[]} when N>1 ->
+			RepeatUntilData(N-1);
+		    Other ->
+			Other
+		end
+	end,
+    {ok,Data2} = F(20),
     ct:log("[GET DATA #2] Received ~w chars: ~s", [length(lists:flatten(Data2)),Data2]),
     VerifyStr = [C || C <- lists:flatten(Data2), C/=$ , C/=$\r, C/=$\n, C/=$>],
 
diff --git a/lib/common_test/test/telnet_server.erl b/lib/common_test/test/telnet_server.erl
index 107d98d72c..2c33cb268a 100644
--- a/lib/common_test/test/telnet_server.erl
+++ b/lib/common_test/test/telnet_server.erl
@@ -59,7 +59,7 @@ init(Opts) ->
     accept(State),
     ok = gen_tcp:close(LSock),
     dbg("telnet_server closed the listen socket ~p\n", [LSock]),
-    ct:sleep(1000),
+    timer:sleep(1000),
     ok.
 
 listen(0, _Port, _Opts) ->
@@ -68,7 +68,7 @@ listen(Retries, Port, Opts) ->
     case gen_tcp:listen(Port, Opts) of
 	{error,eaddrinuse} ->
 	    dbg("Listen port not released, trying again..."),
-	    ct:sleep(5000),
+	    timer:sleep(5000),
 	    listen(Retries-1, Port, Opts);
 	Ok = {ok,_LSock} ->
 	    Ok;
@@ -193,6 +193,9 @@ handle_cmd([?AYT|T],State) ->
     %% Used when testing 'newline' option in ct_telnet:send and ct_telnet:cmd.
     send("yes\r\n> ",State),
     handle_data(T,State);
+handle_cmd([?NOP|T],State) ->
+    %% Used for 'keep alive'
+    handle_data(T,State);
 handle_cmd([_H|T],State) ->
     %% Not responding to this command
     handle_cmd(T,State);
@@ -203,6 +206,9 @@ handle_break_cmd([$q|T],State) ->
     %% Dummy cmd allowed in break mode - quit break mode
     send("\r\n> ",State),
     handle_data(T,State#state{break=false});
+handle_break_cmd([_H|T],State) ->
+    %% Unknown command i break mode - ignore
+    handle_break_cmd(T,State);
 handle_break_cmd([],State) ->
     {ok,State}.
 
@@ -220,7 +226,7 @@ do_handle_data("echo_sep " ++ Data,State) ->
     Msgs = string:tokens(Data," "),
     lists:foreach(fun(Msg) ->
 			  send(Msg,State),
-			  ct:sleep(10)
+			  timer:sleep(10)
 		  end, Msgs),
     send("\r\n> ",State),
     {ok,State};
@@ -245,7 +251,7 @@ do_handle_data("echo_loop " ++ Data,State) ->
 do_handle_data("echo_delayed_prompt "++Data,State) ->
     [MsStr|EchoData] = string:tokens(Data, " "),
     send(string:join(EchoData,"\n"),State),
-    ct:sleep(list_to_integer(MsStr)),
+    timer:sleep(list_to_integer(MsStr)),
     send("\r\n> ",State),
     {ok,State};
 do_handle_data("disconnect_after " ++WaitStr,State) ->
@@ -298,7 +304,7 @@ send_loop(T0,T,Data,State) ->
 	    ok;
        true ->
 	    send(Data,State),
-	    ct:sleep(500),
+	    timer:sleep(500),
 	    send_loop(T0,T,Data,State)
     end.
 
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 3242511f4a..338cd3dc0a 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -185,7 +185,7 @@ start(Config) when is_list(Config) ->
 	gen_server:start({global, my_test_name},
 			 gen_server_SUITE, [], []),
     ok = gen_server:call({global, my_test_name}, stop),
-    ct:sleep(1),
+    busy_wait_for_process(Pid4,600),
     {'EXIT', {noproc,_}} = (catch gen_server:call(Pid4, started_p, 10)),
 
     %% global register linked
@@ -214,7 +214,7 @@ start(Config) when is_list(Config) ->
 	gen_server:start({via, dummy_via, my_test_name},
 			 gen_server_SUITE, [], []),
     ok = gen_server:call({via, dummy_via, my_test_name}, stop),
-    ct:sleep(1),
+    busy_wait_for_process(Pid6,600),
     {'EXIT', {noproc,_}} = (catch gen_server:call(Pid6, started_p, 10)),
 
     %% via register linked