2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 18ec5680..5940ed7e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,9 @@ CODE_VERSION=$(shell $(PYVER) -c "from cloudinit import version; print(version.v
 
 all: check
 
-check: check_version pep8 $(pyflakes) test $(yaml)
+check: check_version test $(yaml)
+
+style-check: pep8 $(pyflakes)
 
 pep8:
 	@$(CWD)/tools/run-pep8
@@ -84,3 +86,4 @@ deb:
 
 .PHONY: test pyflakes pyflakes3 clean pep8 rpm deb yaml check_version
 .PHONY: pip-test-requirements pip-requirements clean_pyc unittest unittest3
+.PHONY: style-check
diff --git a/tox.ini b/tox.ini
index e79ea6aa..ca5d8b87 100644
--- a/tox.ini
+++ b/tox.ini
@@ -79,3 +79,11 @@ deps =
     jsonpatch==1.2
     six==1.9.0
     -r{toxinidir}/test-requirements.txt
+
+[testenv:tip-pycodestyle]
+commands = {envpython} -m pycodestyle {posargs:cloudinit/ tests/ tools/}
+deps = pycodestyle
+
+[testenv:tip-pyflakes]
+commands = {envpython} -m pyflakes {posargs:cloudinit/ tests/ tools/}
+deps = pyflakes