diff --git a/lib/http/client.rb b/lib/http/client.rb
index 91ac8409..daca1c23 100644
--- a/lib/http/client.rb
+++ b/lib/http/client.rb
@@ -82,7 +82,6 @@ def perform(req, options)
         :proxy_headers => @connection.proxy_response_headers,
         :connection    => @connection,
         :encoding      => options.encoding,
-        :uri           => req.uri,
         :request       => req
       )
 
diff --git a/lib/http/response.rb b/lib/http/response.rb
index 8b86df05..6527b2bc 100644
--- a/lib/http/response.rb
+++ b/lib/http/response.rb
@@ -47,11 +47,11 @@ class Response
     # @option opts [String] :uri
     def initialize(opts)
       @version       = opts.fetch(:version)
-      @uri           = HTTP::URI.parse(opts.fetch(:uri)) if opts.include? :uri
+      @request       = opts.fetch(:request)
+      @uri           = HTTP::URI.parse(opts[:uri] || @request.uri)
       @status        = HTTP::Response::Status.new(opts.fetch(:status))
       @headers       = HTTP::Headers.coerce(opts[:headers] || {})
       @proxy_headers = HTTP::Headers.coerce(opts[:proxy_headers] || {})
-      @request       = opts.fetch(:request)
 
       if opts.include?(:body)
         @body = opts.fetch(:body)