diff --git a/setup.py b/setup.py
index 8e649003..3e110f8a 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 
 INSTALL_REQUIRES = (
-    ['pycodestyle == 2.5.0', 'toml']
+    ['pycodestyle >= 2.6.0', 'toml']
 )
 
 
diff --git a/test/suite/out/E72.py b/test/suite/out/E72.py
index 8a42c56f..df5cc0d3 100644
--- a/test/suite/out/E72.py
+++ b/test/suite/out/E72.py
@@ -1,15 +1,16 @@
 #: E721
-import types
 if isinstance(res, type(42)):
     pass
 #: E721
 if not isinstance(res, type("")):
     pass
 #: E721
+import types
 
 if res == types.IntType:
     pass
 #: E721
+import types
 
 if not isinstance(res, types.ListType):
     pass
diff --git a/test/test_autopep8.py b/test/test_autopep8.py
index 823b8368..42569afa 100755
--- a/test/test_autopep8.py
+++ b/test/test_autopep8.py
@@ -3646,8 +3646,6 @@ def foobar(sldfkjlsdfsdf, kksdfsdfsf,sdfsdfsdf, sdfsdfkdk, szdfsdfsdf, sdfsdfsdf
     pass
 """
         fixed = """\
-
-
 def foobar(
         sldfkjlsdfsdf,
         kksdfsdfsf,
@@ -5161,6 +5159,22 @@ def f(n):
         with autopep8_context(line) as result:
             self.assertEqual(result[:4], 'from')
 
+    @unittest.skipIf(
+        (sys.version_info.major >= 3 and sys.version_info.minor < 8)
+        or sys.version_info.major < 3,
+        "syntax error in Python3.7 and lower version",
+    )
+    def test_with_walrus_operator(self):
+        """check pycodestyle 2.6.0+"""
+        line = """\
+sql_stmt = ""
+with open(filename) as f:
+    while line := f.readline():
+        sql_stmt += line
+"""
+        with autopep8_context(line) as result:
+            self.assertEqual(line, result)
+
 
 class UtilityFunctionTests(unittest.TestCase):
 
@@ -6286,7 +6300,7 @@ def _table_field_is_plain_widget(self, widget):
 class Useless(object):
 
     def _table_field_is_plain_widget(self, widget):
-        if widget.__class__ == Widget or(
+        if widget.__class__ == Widget or (
                 widget.__class__ == WidgetMeta and Widget in widget.__bases__):
             return True
 
@@ -6681,8 +6695,6 @@ def test_e501_experimental_decorator(self):
 @foo(('xxxxxxxxxxxxxxxxxxxxxxxxxx', users.xxxxxxxxxxxxxxxxxxxxxxxxxx), ('yyyyyyyyyyyy', users.yyyyyyyyyyyy), ('zzzzzzzzzzzzzz', users.zzzzzzzzzzzzzz))
 """
         fixed = """\
-
-
 @foo(('xxxxxxxxxxxxxxxxxxxxxxxxxx', users.xxxxxxxxxxxxxxxxxxxxxxxxxx),
      ('yyyyyyyyyyyy', users.yyyyyyyyyyyy),
      ('zzzzzzzzzzzzzz', users.zzzzzzzzzzzzzz))