diff --git a/Lib/cgi.py b/Lib/cgi.py
index 14f1d8fb571..2ef987ee6f6 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -1043,6 +1043,7 @@ def test():
 	print_form(form)
 	print_environ()
 	print_directory()
+	print_arguments()
 	print_environ_usage()
     except:
 	print "\n\n<PRE>"	# Turn off HTML word wrap
@@ -1087,6 +1088,13 @@ def print_directory():
 	print escape(pwd)
     print
 
+def print_arguments():
+    print
+    print "<H3>Command line Arguments:</H3>"
+    print
+    print sys.argv
+    print
+
 def print_environ_usage():
     """Dump a list of environment variables used by CGI as HTML."""
     print """