diff --git a/test/base_test.rb b/test/base_test.rb
index 050691d6..8222c160 100644
--- a/test/base_test.rb
+++ b/test/base_test.rb
@@ -156,7 +156,6 @@ class BaseTest < Test::Unit::TestCase
 
     class TestMiddlewareContentLength < Sinatra::Base
       get '/forward' do
-        res = forward
         'From after explicit forward!'
       end
     end
diff --git a/test/integration_helper.rb b/test/integration_helper.rb
index cabd9f8c..314db494 100644
--- a/test/integration_helper.rb
+++ b/test/integration_helper.rb
@@ -221,7 +221,7 @@ module IntegrationHelper
 
     base_port = 5000 + Process.pid % 100
     Sinatra::Base.server.each_with_index do |server, index|
-      Server.run(server, 5000+index)
+      Server.run(server, base_port+index)
     end
   end
 end