diff --git a/tests/pytype_blacklist.txt b/tests/pytype_blacklist.txt
index 774185196..dba9c60c6 100644
--- a/tests/pytype_blacklist.txt
+++ b/tests/pytype_blacklist.txt
@@ -20,15 +20,6 @@ third_party/2and3/attr/__init__.pyi
 third_party/2and3/attr/converters.pyi
 third_party/2and3/attr/filters.pyi
 third_party/2and3/attr/validators.pyi
-third_party/2and3/boto/__init__.pyi
-third_party/2and3/boto/compat.pyi
-third_party/2and3/boto/exception.pyi
-third_party/2and3/boto/kms/exceptions.pyi
-third_party/2and3/boto/s3/__init__.pyi
-third_party/2and3/boto/s3/acl.pyi
-third_party/2and3/boto/s3/bucket.pyi
-third_party/2and3/boto/s3/bucketlistresultset.pyi
-third_party/2and3/boto/s3/connection.pyi
 third_party/2and3/boto/utils.pyi
 third_party/2and3/click/README.md
 third_party/2and3/click/__init__.pyi
@@ -90,16 +81,6 @@ third_party/2and3/google/protobuf/unittest_pb2.pyi
 third_party/2and3/google/protobuf/unittest_proto3_arena_pb2.pyi
 third_party/2and3/google/protobuf/util/json_format_proto3_pb2.pyi
 third_party/2and3/google/protobuf/wrappers_pb2.pyi
-third_party/2and3/jinja2/__init__.pyi
-third_party/2and3/jinja2/environment.pyi
-third_party/2and3/jinja2/loaders.pyi
-third_party/2and3/jinja2/runtime.pyi
-third_party/2and3/jinja2/sandbox.pyi
-third_party/2and3/jinja2/utils.pyi
-third_party/2and3/markupsafe/__init__.pyi
-third_party/2and3/markupsafe/_compat.pyi
-third_party/2and3/markupsafe/_native.pyi
-third_party/2and3/markupsafe/_speedups.pyi
 third_party/2and3/pymysql/__init__.pyi
 third_party/2and3/pymysql/connections.pyi
 third_party/2and3/pymysql/converters.pyi
diff --git a/third_party/2and3/boto/compat.pyi b/third_party/2and3/boto/compat.pyi
index 62d02a509..ce997030a 100644
--- a/third_party/2and3/boto/compat.pyi
+++ b/third_party/2and3/boto/compat.pyi
@@ -10,7 +10,7 @@ expanduser: Any
 if sys.version_info >= (3, 0):
     StandardError = Exception
 else:
-    StandardError = __builtins__.StandardError
+    from __builtin__ import StandardError as StandardError
 
 long_type: Any
 unquote_str: Any
diff --git a/third_party/2and3/markupsafe/_compat.pyi b/third_party/2and3/markupsafe/_compat.pyi
index c063ca8a6..7257425cf 100644
--- a/third_party/2and3/markupsafe/_compat.pyi
+++ b/third_party/2and3/markupsafe/_compat.pyi
@@ -13,7 +13,7 @@ if sys.version_info[0] >= 3:
     unichr = chr
     int_types = int,
 else:
+    from __builtin__ import unichr as unichr
     text_type = unicode
     string_types = (str, unicode)
-    unichr = __builtins__.unichr
     int_types = (int, long)