diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 0000000..680ca3a
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,2 @@
+[settings]
+not_skip = __init__.py
diff --git a/dcos/__init__.py b/dcos/__init__.py
index 26472a7..6a657f5 100644
--- a/dcos/__init__.py
+++ b/dcos/__init__.py
@@ -12,6 +12,7 @@ Options:
 
 import os
 import subprocess
+
 import docopt
 
 
diff --git a/dcos/config.py b/dcos/config.py
index 26fa792..12fbae4 100644
--- a/dcos/config.py
+++ b/dcos/config.py
@@ -11,6 +11,7 @@ Options:
 """
 
 import os
+
 import docopt
 import toml
 
diff --git a/dcos/subcommand.py b/dcos/subcommand.py
index 9b3c41a..669c6eb 100644
--- a/dcos/subcommand.py
+++ b/dcos/subcommand.py
@@ -9,6 +9,7 @@ Options:
 """
 
 import subprocess
+
 import docopt
 
 
diff --git a/tests/test_config.py b/tests/test_config.py
index f576adf..7375786 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,5 +1,5 @@
-from dcos import config
 import pytest
+from dcos import config
 
 
 @pytest.fixture
diff --git a/tox.ini b/tox.ini
index 7574599..0e16b95 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,9 @@ envlist = py27,py34
 deps =
   pytest
   flake8
+  isort
 
 commands =
   flake8 dcos tests
+  isort -rc -c -vb dcos tests
   py.test tests