diff --git a/src/python/.gitignore b/src/python/.gitignore
index 7b520579a0819..41813129bdbb1 100644
--- a/src/python/.gitignore
+++ b/src/python/.gitignore
@@ -1,3 +1,4 @@
 gens/
 *_pb2.py
 *_pb2_grpc.py
+*.egg-info/
diff --git a/src/python/grpcio_testing/grpc_testing/_server/_rpc.py b/src/python/grpcio_testing/grpc_testing/_server/_rpc.py
index d713eb92c0651..736b714dc6d0e 100644
--- a/src/python/grpcio_testing/grpc_testing/_server/_rpc.py
+++ b/src/python/grpcio_testing/grpc_testing/_server/_rpc.py
@@ -21,6 +21,7 @@
 logging.basicConfig()
 _LOGGER = logging.getLogger(__name__)
 
+
 class Rpc(object):
 
     def __init__(self, handler, invocation_metadata):
diff --git a/src/python/grpcio_tests/tests/unit/_credentials_test.py b/src/python/grpcio_tests/tests/unit/_credentials_test.py
index 4ba40e2e8a109..be7378ecbce58 100644
--- a/src/python/grpcio_tests/tests/unit/_credentials_test.py
+++ b/src/python/grpcio_tests/tests/unit/_credentials_test.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 """Tests of credentials."""
 
-
 import unittest
 import logging
 
diff --git a/src/python/grpcio_tests/tests/unit/_logging_test.py b/src/python/grpcio_tests/tests/unit/_logging_test.py
index dcafd38878ded..08163089dec6e 100644
--- a/src/python/grpcio_tests/tests/unit/_logging_test.py
+++ b/src/python/grpcio_tests/tests/unit/_logging_test.py
@@ -18,10 +18,12 @@
 import grpc
 import logging
 
+
 class LoggingTest(unittest.TestCase):
 
-  def test_logger_not_occupied(self):
-    self.assertEqual(0, len(logging.getLogger().handlers))
+    def test_logger_not_occupied(self):
+        self.assertEqual(0, len(logging.getLogger().handlers))
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/src/python/grpcio_tests/tests/unit/_server_test.py b/src/python/grpcio_tests/tests/unit/_server_test.py
index 47c32413ddb57..2c8205f3650ca 100644
--- a/src/python/grpcio_tests/tests/unit/_server_test.py
+++ b/src/python/grpcio_tests/tests/unit/_server_test.py
@@ -50,5 +50,5 @@ def test_not_a_generic_rpc_handler_after_construction(self):
 
 
 if __name__ == '__main__':
-    logging.basicConfig() 
+    logging.basicConfig()
     unittest.main(verbosity=2)