diff --git a/stdlib/2/encodings/utf_8.pyi b/stdlib/2/encodings/utf_8.pyi
index 0111184b7..d38bd58d0 100644
--- a/stdlib/2/encodings/utf_8.pyi
+++ b/stdlib/2/encodings/utf_8.pyi
@@ -1,14 +1,15 @@
 import codecs
+from typing import Text, Tuple
 
 class IncrementalEncoder(codecs.IncrementalEncoder):
-    pass
+    def encode(self, input: Text, final: bool = ...) -> bytes: ...
+
 class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
-    pass
-class StreamWriter(codecs.StreamWriter):
-    pass
-class StreamReader(codecs.StreamReader):
-    pass
+    def _buffer_decode(self, input: bytes, errors: str, final: bool) -> Tuple[Text, int]: ...
+
+class StreamWriter(codecs.StreamWriter): ...
+class StreamReader(codecs.StreamReader): ...
 
 def getregentry() -> codecs.CodecInfo: ...
-def encode(input: str, errors: str = ...) -> bytes: ...
-def decode(input: bytes, errors: str = ...) -> str: ...
+def encode(input: Text, errors: Text = ...) -> bytes: ...
+def decode(input: bytes, errors: Text = ...) -> Text: ...
diff --git a/stdlib/3/encodings/utf_8.pyi b/stdlib/3/encodings/utf_8.pyi
index 0111184b7..d38bd58d0 100644
--- a/stdlib/3/encodings/utf_8.pyi
+++ b/stdlib/3/encodings/utf_8.pyi
@@ -1,14 +1,15 @@
 import codecs
+from typing import Text, Tuple
 
 class IncrementalEncoder(codecs.IncrementalEncoder):
-    pass
+    def encode(self, input: Text, final: bool = ...) -> bytes: ...
+
 class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
-    pass
-class StreamWriter(codecs.StreamWriter):
-    pass
-class StreamReader(codecs.StreamReader):
-    pass
+    def _buffer_decode(self, input: bytes, errors: str, final: bool) -> Tuple[Text, int]: ...
+
+class StreamWriter(codecs.StreamWriter): ...
+class StreamReader(codecs.StreamReader): ...
 
 def getregentry() -> codecs.CodecInfo: ...
-def encode(input: str, errors: str = ...) -> bytes: ...
-def decode(input: bytes, errors: str = ...) -> str: ...
+def encode(input: Text, errors: Text = ...) -> bytes: ...
+def decode(input: bytes, errors: Text = ...) -> Text: ...