diff -r cc0e72082e52 Lib/http/server.py
--- a/Lib/http/server.py	Tue Apr 16 11:19:11 2013 -0400
+++ b/Lib/http/server.py	Tue Apr 16 18:19:35 2013 +0200
@@ -1183,14 +1183,14 @@
 
 
 def test(HandlerClass = BaseHTTPRequestHandler,
-         ServerClass = HTTPServer, protocol="HTTP/1.0", port=8000):
+         ServerClass = HTTPServer, protocol="HTTP/1.0", port=8000, bind=''):
     """Test the HTTP request handler class.
 
     This runs an HTTP server on port 8000 (or the first command line
     argument).
 
     """
-    server_address = ('', port)
+    server_address = (bind, port)
 
     HandlerClass.protocol_version = protocol
     httpd = ServerClass(server_address, HandlerClass)
@@ -1208,12 +1208,15 @@
     parser = argparse.ArgumentParser()
     parser.add_argument('--cgi', action='store_true',
                        help='Run as CGI Server')
+    parser.add_argument('--bind', '-b', action='store',
+                        default='', type=str, metavar='ADDRESS',
+                        help='Specify alternate bind address [default: all interfaces]')
     parser.add_argument('port', action='store',
                         default=8000, type=int,
                         nargs='?',
                         help='Specify alternate port [default: 8000]')
     args = parser.parse_args()
     if args.cgi:
-        test(HandlerClass=CGIHTTPRequestHandler, port=args.port)
+        test(HandlerClass=CGIHTTPRequestHandler, port=args.port, bind=args.bind)
     else:
-        test(HandlerClass=SimpleHTTPRequestHandler, port=args.port)
+        test(HandlerClass=SimpleHTTPRequestHandler, port=args.port, bind=args.bind)