diff --git a/memcached_fake.t b/memcached_fake.t
index d3497df..7d028b9 100644
--- a/memcached_fake.t
+++ b/memcached_fake.t
@@ -57,6 +57,9 @@
 $t->run_daemon(\&memcached_fake_daemon);
 $t->run();
 
+$t->waitforsocket('127.0.0.1:8081')
+	or die "Can't start fake memcached";
+
 ###############################################################################
 
 like(http_get('/'), qr/SEE-THIS/, 'memcached split trailer');
@@ -76,6 +79,8 @@
 	)
 		or die "Can't create listening socket: $!\n";
 
+	local $SIG{PIPE} = 'IGNORE';
+
 	while (my $client = $server->accept()) {
 		$client->autoflush(1);