diff --git a/.travis.yml b/.travis.yml
index 4484ebfd..aaa2cb96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,9 @@
-language: cpp
-
 matrix:
   include:
     # Job 1) Test C++ w/ GCC
     - os: linux
       dist: trusty
+      language: cpp
       addons:
         apt:
           sources:
@@ -22,12 +21,21 @@ matrix:
     # Job 2) Lint checks on Python and C++
     - os: linux
       dist: trusty
+      language: python
+      python: 3.6
       addons:
         apt:
+          sources:
+            - ubuntu-toolchain-r-test
           packages:
             - clang-format-3.9
+            - g++-6
       install:
-        - pip3 install --user -r requirements.txt
+        - export CC=gcc-6
+        - export CXX=g++-6
+        - pip install -r requirements.txt
       script:
+        - export CC=gcc-6
+        - export CXX=g++-6
         - make format
         - test $(git status --porcelain | wc -l) -eq 0 || { git diff; false; } 
diff --git a/fuzzers/074-dump_all/ignored_wires.txt b/fuzzers/074-dump_all/artix7_ignored_wires.txt
similarity index 100%
rename from fuzzers/074-dump_all/ignored_wires.txt
rename to fuzzers/074-dump_all/artix7_ignored_wires.txt
diff --git a/fuzzers/074-dump_all/generate_after_dump.sh b/fuzzers/074-dump_all/generate_after_dump.sh
index a3226f52..75d38f60 100755
--- a/fuzzers/074-dump_all/generate_after_dump.sh
+++ b/fuzzers/074-dump_all/generate_after_dump.sh
@@ -10,4 +10,5 @@ python3 create_node_tree.py \
   --ordered_wires_root_dir ../072-ordered_wires/specimen_001/ \
   --output_dir output
 python3 reduce_site_types.py --output_dir output
-python3 generate_grid.py --root_dir specimen_001/ --output_dir output
+python3 generate_grid.py --root_dir specimen_001/ --output_dir output \
+  --ignored_wires ${XRAY_DATABASE}_ignored_wires.txt
diff --git a/fuzzers/074-dump_all/generate_grid.py b/fuzzers/074-dump_all/generate_grid.py
index c1fd2468..c841be53 100644
--- a/fuzzers/074-dump_all/generate_grid.py
+++ b/fuzzers/074-dump_all/generate_grid.py
@@ -10,7 +10,6 @@ import os.path
 import json
 import datetime
 import pickle
-import inspect
 import sys
 
 
@@ -561,6 +560,7 @@ def main():
     parser.add_argument('--root_dir', required=True)
     parser.add_argument('--output_dir', required=True)
     parser.add_argument('--verify_only', action='store_true')
+    parser.add_argument('--ignored_wires')
 
     args = parser.parse_args()
 
@@ -648,9 +648,7 @@ def main():
             json.dump(error_nodes, f, indent=2)
 
         ignored_wires = []
-        path_to_file = os.path.dirname(
-            os.path.abspath(inspect.getfile(inspect.currentframe())))
-        ignored_wires_file = os.path.join(path_to_file, 'ignored_wires.txt')
+        ignored_wires_file = args.ignored_wires
         if os.path.exists(ignored_wires_file):
             with open(ignored_wires_file) as f:
                 ignored_wires = set(l.strip() for l in f)