diff --git a/setup.py b/setup.py
index de350a8..4d40862 100644
--- a/setup.py
+++ b/setup.py
@@ -108,8 +108,8 @@ setuptools.setup(
             PEP8_PLUGIN('comparison_to_singleton'),
             PEP8_PLUGIN('comparison_negative'),
             PEP8_PLUGIN('comparison_type'),
-            # NOTE(sigmavirus24): Add this back once PyCodestyle 2.1.0 is out
-            # PEP8_PLUGIN('ambiguous_identifier'),
+            PEP8_PLUGIN('ambiguous_identifier'),
+            PEP8_PLUGIN('bare_except'),
             PEP8_PLUGIN('python_3000_has_key'),
             PEP8_PLUGIN('python_3000_raise_comma'),
             PEP8_PLUGIN('python_3000_not_equal'),