diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 404b6185c2..41729beefb 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -264,7 +264,7 @@ module ActionDispatch
             :params => parameters,
 
             "SERVER_NAME"     => hostname,
-            "SERVER_PORT"     => (port ? port : (https? ? "443" : "80")),
+            "SERVER_PORT"     => port || https? ? "443" : "80",
             "HTTPS"           => https? ? "on" : "off",
             "rack.url_scheme" => https? ? "https" : "http",