diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb
index 42067854eea102dd77de2be6b927495908d004e9..ef1964fd19be5afd679d22e2b6e2fc33cda5cba0 100644
--- a/actionpack/test/dispatch/rack_test.rb
+++ b/actionpack/test/dispatch/rack_test.rb
@@ -119,7 +119,7 @@ class RackRequestTest < BaseRackTest
     assert_equal "[2001:1234:5678:9abc:def0::dead:beef]", @request.host
   end
 
-  test "cgi environment variables" do
+  test "CGI environment variables" do
     assert_equal "Basic", @request.auth_type
     assert_equal 0, @request.content_length
     assert_equal nil, @request.content_mime_type
diff --git a/guides/source/testing.md b/guides/source/testing.md
index 34573d2b0a2c4833630c2708a55a3bee66319750..1880dfb9ceb4c038c99aec3b1f10f8c882063556 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -518,8 +518,10 @@ You also have access to three instance variables in your functional tests:
 
 ### Setting Headers and CGI variables
 
-Headers and cgi variables can be set directly on the `@request`
-instance variable:
+[HTTP headers](http://tools.ietf.org/search/rfc2616#section-5.3)
+and
+[CGI variables](http://tools.ietf.org/search/rfc3875#section-4.1)
+can be set directly on the `@request` instance variable:
 
 ```ruby
 # setting a HTTP Header