diff --git a/ChangeLog b/ChangeLog
index 5360782a..0e9ea789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Wait data arrives at clientSocket_ in
+	FtpConnectionTest::testReceiveEpsvResponse().
+	* test/FtpConnectionTest.cc
+
 2010-08-27  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added bt-tracker and bt-exclude-tracker to -i list option.
diff --git a/test/FtpConnectionTest.cc b/test/FtpConnectionTest.cc
index 25c93453..601274b5 100644
--- a/test/FtpConnectionTest.cc
+++ b/test/FtpConnectionTest.cc
@@ -310,22 +310,27 @@ void FtpConnectionTest::testReceiveEpsvResponse()
   CPPUNIT_ASSERT_EQUAL((uint16_t)12000, port);
 
   serverSocket_->writeData("229 Success |||12000|)\r\n");
+  waitRead(clientSocket_);
   CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port));
   CPPUNIT_ASSERT_EQUAL((uint16_t)0, port);
 
   serverSocket_->writeData("229 Success (|||12000|\r\n");
+  waitRead(clientSocket_);
   CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port));
   CPPUNIT_ASSERT_EQUAL((uint16_t)0, port);
 
   serverSocket_->writeData("229 Success ()|||12000|\r\n");
+  waitRead(clientSocket_);
   CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port));
   CPPUNIT_ASSERT_EQUAL((uint16_t)0, port);
 
   serverSocket_->writeData("229 Success )(|||12000|)\r\n");
+  waitRead(clientSocket_);
   CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port));
   CPPUNIT_ASSERT_EQUAL((uint16_t)0, port);
 
   serverSocket_->writeData("229 Success )(||12000|)\r\n");
+  waitRead(clientSocket_);
   CPPUNIT_ASSERT_EQUAL((unsigned int)229, ftp_->receiveEpsvResponse(port));
   CPPUNIT_ASSERT_EQUAL((uint16_t)0, port);
 }