diff --git a/meta/check-py3k.sh b/meta/check-py3k.sh
index 19096339bf..3ac939ea15 100755
--- a/meta/check-py3k.sh
+++ b/meta/check-py3k.sh
@@ -5,3 +5,4 @@
 # Install pylint with 'pip install pylint'.
 cd $(dirname "$0")
 pylint --py3k --reports=no -- *.py cretonne isa
+flake8 .
diff --git a/meta/gen_instr.py b/meta/gen_instr.py
index 92808524c5..13bcaa6842 100644
--- a/meta/gen_instr.py
+++ b/meta/gen_instr.py
@@ -71,7 +71,8 @@ def gen_instruction_data_impl(fmt):
                             .format(f.name))
 
         fmt.doc_comment('Mutable reference to the type of the first result.')
-        with fmt.indented('pub fn first_type_mut(&mut self) -> &mut Type {', '}'):
+        with fmt.indented(
+                'pub fn first_type_mut(&mut self) -> &mut Type {', '}'):
             with fmt.indented('match *self {', '}'):
                 for f in cretonne.InstructionFormat.all_formats:
                     fmt.line(
@@ -152,7 +153,8 @@ def gen_instruction_data_impl(fmt):
                         if f.boxed_storage:
                             fmt.line(
                                     n +
-                                    ' {{ ref data, .. }} => Some(data.args[{}]),'
+                                    ' {{ ref data, .. }} => ' +
+                                    'Some(data.args[{}]),'
                                     .format(i))
                         else:
                             fmt.line(