diff --git a/Gemfile.lock b/Gemfile.lock
index 6a8f9040d7e33..1a5ca8d49e0e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -356,8 +356,8 @@ GEM
     powerpack (0.1.2)
     psych (3.0.3)
     public_suffix (3.0.3)
-    puma (3.12.0)
-    puma (3.12.0-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 9df36b3444aad..5fe1b4e6e700d 100644
--- a/railties/test/application/server_test.rb
+++ b/railties/test/application/server_test.rb
@@ -30,13 +30,13 @@ def teardown
       pid = nil
 
       Bundler.with_original_env do
-        pid = Process.spawn("bin/rails server -P tmp/dummy.pid", chdir: app_path, in: replica, out: replica, err: replica)
+        pid = Process.spawn("bin/rails server -b localhost -P tmp/dummy.pid", chdir: app_path, in: replica, out: replica, err: replica)
         assert_output("Listening", primary)
 
         rails("restart")
 
         assert_output("Restarting", primary)
-        assert_output("Inherited", primary)
+        assert_output("tcp://localhost:3000", primary)
       ensure
         kill(pid) if pid
       end