diff --git a/t/lib/MemcachedTest.pm b/t/lib/MemcachedTest.pm
index a9557e5299..d917bf2ff2 100644
--- a/t/lib/MemcachedTest.pm
+++ b/t/lib/MemcachedTest.pm
@@ -352,8 +352,7 @@ sub new_memcached {
         # A slow/emulated/valgrinded/etc system may take longer than a second
         # for the unix socket to appear.
         my $filename = $1;
-        for (1..20) {
-            sleep 1;
+        for (1..60) {
             my $conn = IO::Socket::UNIX->new(Peer => $filename);
 
             if ($conn) {
@@ -364,7 +363,7 @@ sub new_memcached {
                                               port => $port);
             } else {
                 croak("Failed to connect to unix socket: memcached not running") unless is_running($childpid);
-                sleep 1;
+                select undef, undef, undef, 0.20;
             }
         }
         croak("Failed to connect to unix domain socket: $! '$filename'") if $@;
diff --git a/t/proxy.t b/t/proxy.t
index 49aab88c54..4a86d83133 100644
--- a/t/proxy.t
+++ b/t/proxy.t
@@ -31,7 +31,7 @@ for (2 .. 6) {
 }
 #my $sock = $srv->sock;
 
-my $p_srv = new_memcached('-o proxy_config=./t/startfile.lua -l 127.0.0.1', 11211);
+my $p_srv = new_memcached('-o proxy_config=./t/startfile.lua');
 my $p_sock = $p_srv->sock;
 
 # hack to help me use T_MEMD_USE_DAEMON for proxy.
diff --git a/t/proxyconfig.t b/t/proxyconfig.t
index 5ea8d48b2e..1f3158afdc 100644
--- a/t/proxyconfig.t
+++ b/t/proxyconfig.t
@@ -70,12 +70,12 @@ for my $port (11511, 11512, 11513) {
 diag "testing failure to start";
 write_modefile("invalid syntax");
 eval {
-    my $p_srv = new_memcached('-o proxy_config=./t/proxyconfig.lua -l 127.0.0.1', 11510);
+    my $p_srv = new_memcached('-o proxy_config=./t/proxyconfig.lua');
 };
 ok($@ && $@ =~ m/Failed to connect/, "server successfully not started");
 
 write_modefile('return "none"');
-my $p_srv = new_memcached('-o proxy_config=./t/proxyconfig.lua -l 127.0.0.1', 11510);
+my $p_srv = new_memcached('-o proxy_config=./t/proxyconfig.lua');
 my $ps = $p_srv->sock;
 $ps->autoflush(1);
 
diff --git a/t/proxyinternal.t b/t/proxyinternal.t
index c9bb8ed458..66c0600a37 100644
--- a/t/proxyinternal.t
+++ b/t/proxyinternal.t
@@ -53,7 +53,7 @@ for my $port (11611, 11612, 11613) {
     push(@mocksrvs, $srv);
 }
 
-my $p_srv = new_memcached("-o proxy_config=./t/proxyinternal.lua,ext_item_size=500,ext_item_age=1,ext_path=$ext_path:64m,ext_max_sleep=100000 -l 127.0.0.1 -U 0", 11510);
+my $p_srv = new_memcached("-o proxy_config=./t/proxyinternal.lua,ext_item_size=500,ext_item_age=1,ext_path=$ext_path:64m,ext_max_sleep=100000");
 my $ps = $p_srv->sock;
 $ps->autoflush(1);
 
diff --git a/t/proxyunits.t b/t/proxyunits.t
index 49594bf439..992e73e6b9 100644
--- a/t/proxyunits.t
+++ b/t/proxyunits.t
@@ -45,7 +45,7 @@ for my $port (11411, 11412, 11413) {
     push(@mocksrvs, $srv);
 }
 
-my $p_srv = new_memcached('-o proxy_config=./t/proxyunits.lua -l 127.0.0.1', 11410);
+my $p_srv = new_memcached('-o proxy_config=./t/proxyunits.lua');
 my $ps = $p_srv->sock;
 $ps->autoflush(1);