diff --git a/test/TC_FXApp.rb b/test/TC_FXApp.rb
index 75010176f8b28a66c611fc53a64aa225838cd619..1ebef42fc923e8e0cc7e841301cb00b56e5b3bbd 100755
--- a/test/TC_FXApp.rb
+++ b/test/TC_FXApp.rb
@@ -33,14 +33,16 @@ class TC_FXApp2 < Fox::TestCase
     app.removeInput(pipe_wr, INPUT_WRITE)
 
     app.addInput(pipe_rd, INPUT_READ, app, FXApp::ID_QUIT)
-    data_sent = false
-    app.addTimeout(1) do
-      data_sent = true
-      pipe_wr.write " "
+    2.times do
+      data_sent = false
+      app.addTimeout(1) do
+        data_sent = true
+        pipe_wr.write " "
+      end
+      app.run
+      assert data_sent, "the read input event shouldn't fire before some data is available"
+      assert " ", pipe_rd.read(1)
     end
-    app.run
-    assert data_sent, "the read input event shouldn't fire before some data is available"
-
     app.removeInput(pipe_rd, INPUT_READ)
     pipe_wr.close
     pipe_rd.close unless pipe_rd.closed?
@@ -50,6 +52,22 @@ class TC_FXApp2 < Fox::TestCase
     check_events *IO.pipe
   end
 
+  def test_addInput_on_socket_accept
+    s = TCPServer.open 'localhost', 0
+    app.addInput(s, INPUT_READ, app, FXApp::ID_QUIT)
+    2.times do
+      pipe_wr = nil
+      app.addTimeout(1) do
+        pipe_wr = TCPSocket.open 'localhost', s.addr[1]
+      end
+      app.run
+      assert pipe_wr, "the read input event shouldn't fire before client connection happens"
+      s.accept.close
+    end
+    app.removeInput(s, INPUT_READ)
+    s.close
+  end
+
   def test_addInput_on_socket
     s = TCPServer.open 'localhost', 0
     pipe_wr = TCPSocket.open 'localhost', s.addr[1]