diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 592bd73924da3883e7ad633d7c99d9d809eb7771..f4450c8a3ccf0bcaeaa36b6de3a3230c3e5ea413 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -106,7 +106,7 @@ def teardown
     teardown_app
   end
 
-  def assert_output(expected, timeout = 0.2)
+  def assert_output(expected, timeout = 5)
     timeout = Time.now + timeout
 
     output = ""
@@ -138,7 +138,7 @@ def spawn_console
       in: @slave, out: @slave, err: @slave
     )
 
-    assert_output "> ", 5
+    assert_output "> ", 30
     pid
   end
 
@@ -157,6 +157,6 @@ def test_sandbox
     write_prompt "Post.transaction { Post.create; raise }"
     write_prompt "Post.count", "=> 0"
   ensure
-    kill pid
+    kill pid if pid
   end
 end