diff --git a/stdlib/2/SocketServer.pyi b/stdlib/2/SocketServer.pyi
index 001e3fad9..41152a2e0 100644
--- a/stdlib/2/SocketServer.pyi
+++ b/stdlib/2/SocketServer.pyi
@@ -1,7 +1,7 @@
 # NB: SocketServer.pyi and socketserver.pyi must remain consistent!
 # Stubs for socketserver
 
-from typing import Any, BinaryIO, Callable, List, Optional, Tuple, Type, Text, Union
+from typing import Any, BinaryIO, Callable, ClassVar, List, Optional, Tuple, Type, Text, Union
 from socket import SocketType
 import sys
 import types
@@ -118,9 +118,16 @@ class BaseRequestHandler:
     def finish(self) -> None: ...
 
 class StreamRequestHandler(BaseRequestHandler):
+    rbufsize: ClassVar[int]  # Undocumented
+    wbufsize: ClassVar[int]  # Undocumented
+    timeout: ClassVar[Optional[float]]  # Undocumented
+    disable_nagle_algorithm: ClassVar[bool]  # Undocumented
+    connection: SocketType  # Undocumented
     rfile: BinaryIO
     wfile: BinaryIO
 
 class DatagramRequestHandler(BaseRequestHandler):
+    packet: SocketType  # Undocumented
+    socket: SocketType  # Undocumented
     rfile: BinaryIO
     wfile: BinaryIO
diff --git a/stdlib/3/http/server.pyi b/stdlib/3/http/server.pyi
index 8682b9c14..fe9fc2384 100644
--- a/stdlib/3/http/server.pyi
+++ b/stdlib/3/http/server.pyi
@@ -27,8 +27,6 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
     path: str
     request_version: str
     headers: email.message.Message
-    rfile: BinaryIO
-    wfile: BinaryIO
     server_version: str
     sys_version: str
     error_message_format: str
diff --git a/stdlib/3/socketserver.pyi b/stdlib/3/socketserver.pyi
index 001e3fad9..41152a2e0 100644
--- a/stdlib/3/socketserver.pyi
+++ b/stdlib/3/socketserver.pyi
@@ -1,7 +1,7 @@
 # NB: SocketServer.pyi and socketserver.pyi must remain consistent!
 # Stubs for socketserver
 
-from typing import Any, BinaryIO, Callable, List, Optional, Tuple, Type, Text, Union
+from typing import Any, BinaryIO, Callable, ClassVar, List, Optional, Tuple, Type, Text, Union
 from socket import SocketType
 import sys
 import types
@@ -118,9 +118,16 @@ class BaseRequestHandler:
     def finish(self) -> None: ...
 
 class StreamRequestHandler(BaseRequestHandler):
+    rbufsize: ClassVar[int]  # Undocumented
+    wbufsize: ClassVar[int]  # Undocumented
+    timeout: ClassVar[Optional[float]]  # Undocumented
+    disable_nagle_algorithm: ClassVar[bool]  # Undocumented
+    connection: SocketType  # Undocumented
     rfile: BinaryIO
     wfile: BinaryIO
 
 class DatagramRequestHandler(BaseRequestHandler):
+    packet: SocketType  # Undocumented
+    socket: SocketType  # Undocumented
     rfile: BinaryIO
     wfile: BinaryIO