diff --git a/Gemfile.lock b/Gemfile.lock
index b35668b6b93c1..b3695f6c7db94 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -347,8 +347,8 @@ GEM
     powerpack (0.1.1)
     psych (2.2.4)
     public_suffix (3.0.2)
-    puma (3.11.4)
-    puma (3.11.4-java)
+    puma (3.12.1)
+    puma (3.12.1-java)
     que (0.14.3)
     qunit-selenium (0.0.4)
       selenium-webdriver
diff --git a/railties/test/application/server_test.rb b/railties/test/application/server_test.rb
index f3a7e00a4db29..932e9cca4e1d6 100644
--- a/railties/test/application/server_test.rb
+++ b/railties/test/application/server_test.rb
@@ -44,13 +44,13 @@ def teardown
       pid = nil
 
       begin
-        pid = Process.spawn("#{app_path}/bin/rails server -P tmp/dummy.pid", in: slave, out: slave, err: slave)
+        pid = Process.spawn("#{app_path}/bin/rails server -b localhost -P tmp/dummy.pid", in: slave, out: slave, err: slave)
         assert_output("Listening", master)
 
         rails("restart")
 
         assert_output("Restarting", master)
-        assert_output("Inherited", master)
+        assert_output("tcp://localhost:3000", master)
       ensure
         kill(pid) if pid
       end