diff --git a/test/ganeti.daemon_unittest.py b/test/ganeti.daemon_unittest.py
index 74ef1cdf2b6e197d1f9c3bf7c9c3e18929cac490..b064027a4aaa83cc96bca6a640ac783a3e55a20a 100755
--- a/test/ganeti.daemon_unittest.py
+++ b/test/ganeti.daemon_unittest.py
@@ -186,12 +186,6 @@ class TestAsyncUDPSocket(testutils.GanetiTestCase):
   def testNoDoubleBind(self):
     self.assertRaises(socket.error, self.client.bind, ("127.0.0.1", self.port))
 
-  def _ThreadedClient(self, payload):
-    self.client.enqueue_send("127.0.0.1", self.port, payload)
-    print "sending %s" % payload
-    while self.client.writable():
-      self.client.handle_write()
-
   def testAsyncClientServer(self):
     self.client.enqueue_send("127.0.0.1", self.port, "p1")
     self.client.enqueue_send("127.0.0.1", self.port, "p2")
@@ -200,6 +194,7 @@ class TestAsyncUDPSocket(testutils.GanetiTestCase):
     self.assertEquals(self.server.received, ["p1", "p2", "terminate"])
 
   def testSyncClientServer(self):
+    self.client.handle_write()
     self.client.enqueue_send("127.0.0.1", self.port, "p1")
     self.client.enqueue_send("127.0.0.1", self.port, "p2")
     while self.client.writable():