diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 75e3ae24..ae00f49d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
--   repo: git@github.com:pre-commit/pre-commit-hooks
+-   repo: https://github.com/pre-commit/pre-commit-hooks.git
     sha: cf550fcab3f12015f8676b8278b30e1a5bc10e70
     hooks:
     -   id: trailing-whitespace
@@ -11,12 +11,13 @@
     -   id: name-tests-test
     -   id: requirements-txt-fixer
     -   id: flake8
--   repo: git@github.com:pre-commit/pre-commit
+-   repo: https://github.com/pre-commit/pre-commit.git
     sha: 8dba3281d5051060755459dcf88e28fc26c27526
     hooks:
     -   id: validate_config
     -   id: validate_manifest
--   repo: git@github.com:asottile/reorder_python_imports
+-   repo: https://github.com/asottile/reorder_python_imports.git
     sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
     hooks:
     -   id: reorder-python-imports
+        language_version: python2.7
diff --git a/pre_commit/clientlib/validate_base.py b/pre_commit/clientlib/validate_base.py
index 68f67f04..3d08a6c3 100644
--- a/pre_commit/clientlib/validate_base.py
+++ b/pre_commit/clientlib/validate_base.py
@@ -3,12 +3,12 @@ from __future__ import unicode_literals
 
 import argparse
 import os.path
-import pkg_resources
 import re
 import sys
 
 import jsonschema
 import jsonschema.exceptions
+import pkg_resources
 import yaml
 
 from pre_commit.jsonschema_extensions import apply_defaults
diff --git a/tox.ini b/tox.ini
index 07c56589..b68d9272 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ commands =
     coverage report --show-missing --fail-under 99
     flake8 {[tox]project} testing tests setup.py
 #    pylint {[tox]project} testing tests setup.py
+    pre-commit run --all-files
 
 [testenv:venv]
 envdir = venv-{[tox]project}