diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py
index a5f17dad5..1558ac322 100644
--- a/presubmit_canned_checks.py
+++ b/presubmit_canned_checks.py
@@ -657,7 +657,7 @@ def RunPylint(input_api, output_api, white_list=None, black_list=None,
     command = [input_api.python_executable,
                input_api.os_path.join(_HERE, 'third_party', 'pylint.py')]
     try:
-      return input_api.subprocess.call(command + files + extra_args)
+      return input_api.subprocess.call(command + files + extra_args, env=env)
     except OSError:
       return 'Pylint failed!'
 
diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
index 752a8c8c7..d4c0ac59d 100755
--- a/tests/presubmit_unittest.py
+++ b/tests/presubmit_unittest.py
@@ -2144,7 +2144,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
     pylint = os.path.join(_ROOT, 'third_party', 'pylint.py')
     pylintrc = os.path.join(_ROOT, 'pylintrc')
     input_api.subprocess.call(
-        ['pyyyyython', pylint, 'file1.py', '--rcfile=%s' % pylintrc])
+        ['pyyyyython', pylint, 'file1.py', '--rcfile=%s' % pylintrc],
+        env=mox.IgnoreArg())
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPylint(
diff --git a/third_party/logilab/__init__.py b/third_party/logilab/__init__.py
index 2958be492..e69de29bb 100644
--- a/third_party/logilab/__init__.py
+++ b/third_party/logilab/__init__.py
@@ -1,5 +0,0 @@
-"""generated file, don't modify or your data will be lost"""
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-    pass