diff --git a/setup.cfg b/setup.cfg
index c86c0b3717..5c858c0e1b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,3 +2,10 @@
 max-line-length = 160
 builtins = _,dynamic_property,__,P,I,lopen,icu_lower,icu_upper,icu_title,ngettext
 ignore = E12,E203,E22,E231,E241,E401,E402,E731,W391
+
+[yapf]
+based_on_style = pep8
+column_limit = 85
+split_penalty_import_names = 100
+dedent_closing_brackets = True
+coalesce_brackets = True