diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py
index 16ee908a98d04..59b254f7763d6 100644
--- a/scripts/run_pylint.py
+++ b/scripts/run_pylint.py
@@ -154,12 +154,12 @@ def get_files_for_linting(allow_limited=True):
     if diff_base is not None and allow_limited:
         result = subprocess.check_output(['git', 'diff', '--name-only',
                                           diff_base])
-        print 'Using files changed relative to %s:' % (diff_base,)
-        print '-' * 60
-        print result.rstrip('\n')  # Don't print trailing newlines.
-        print '-' * 60
+        print('Using files changed relative to %s:' % (diff_base,))
+        print('-' * 60)
+        print(result.rstrip('\n'))  # Don't print trailing newlines.
+        print('-' * 60)
     else:
-        print 'Diff base not specified, listing all files in repository.'
+        print('Diff base not specified, listing all files in repository.')
         result = subprocess.check_output(['git', 'ls-files'])
 
     return result.rstrip('\n').split('\n'), diff_base
@@ -217,7 +217,7 @@ def lint_fileset(filenames, rcfile, description):
             print(error_message, file=sys.stderr)
             sys.exit(status_code)
     else:
-        print 'Skipping %s, no files to lint.' % (description,)
+        print('Skipping %s, no files to lint.' % (description,))
 
 
 def main():
diff --git a/scripts/verify_included_modules.py b/scripts/verify_included_modules.py
index 897206a5ff226..52752901f81e2 100644
--- a/scripts/verify_included_modules.py
+++ b/scripts/verify_included_modules.py
@@ -30,7 +30,6 @@
 OBJECT_INVENTORY_RELPATH = os.path.join('_build', 'html', 'objects.inv')
 IGNORED_PREFIXES = ('test_', '_')
 IGNORED_MODULES = frozenset([
-    'gcloud.bigquery.query',
     'gcloud.bigtable.client',
     'gcloud.bigtable.cluster',
     'gcloud.bigtable.column_family',
diff --git a/tox.ini b/tox.ini
index 330428c3f2a37..82ad3e694e786 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,6 +76,7 @@ deps =
     pep8
     pylint
     unittest2
+    Sphinx
 passenv = {[testenv:system-tests]passenv}
 
 [testenv:system-tests]