diff --git a/promenade/builder.py b/promenade/builder.py
index 3453f95a..922a4a5a 100644
--- a/promenade/builder.py
+++ b/promenade/builder.py
@@ -65,7 +65,9 @@ class Builder:
         script = renderer.render_template(
             sub_config,
             template='scripts/genesis.sh',
-            context={'tarball': tarball})
+            context={
+                'tarball': tarball
+            })
 
         _write_script(output_dir, 'genesis.sh', script)
 
@@ -88,7 +90,9 @@ class Builder:
         script = renderer.render_template(
             sub_config,
             template='scripts/join.sh',
-            context={'tarball': tarball})
+            context={
+                'tarball': tarball
+            })
 
         _write_script(output_dir, _join_name(node_name), script)
 
diff --git a/promenade/generator.py b/promenade/generator.py
index c68a0b91..1e187be8 100644
--- a/promenade/generator.py
+++ b/promenade/generator.py
@@ -32,9 +32,9 @@ class Generator:
             'apiserver',
             ca='kubernetes',
             cn='apiserver',
-            hosts=self._service_dns('kubernetes', 'default') + [
-                'localhost', '127.0.0.1', 'apiserver.kubernetes.promenade'
-            ] + [self.config['KubernetesNetwork:kubernetes.service_ip']])
+            hosts=self._service_dns('kubernetes', 'default') +
+            ['localhost', '127.0.0.1', 'apiserver.kubernetes.promenade'] +
+            [self.config['KubernetesNetwork:kubernetes.service_ip']])
         self.gen(
             'certificate',
             'apiserver-etcd',
diff --git a/promenade/pki.py b/promenade/pki.py
index 7c4ad457..946212e9 100644
--- a/promenade/pki.py
+++ b/promenade/pki.py
@@ -75,8 +75,10 @@ class PKI:
             name,
             groups=[],
             hosts=[],
-            key={'algo': 'rsa',
-                 'size': 2048}):
+            key={
+                'algo': 'rsa',
+                'size': 2048
+            }):
         return json.dumps({
             'CN': name,
             'key': key,
diff --git a/tox.ini b/tox.ini
index 96f85fcf..2ad5d043 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,8 +16,21 @@ commands =
     rm -rf docs/build
     python setup.py build_sphinx {posargs}
 
+[testenv:fmt]
+deps = yapf
+commands =
+    yapf -ir {toxinidir}/promenade
+
 [testenv:freeze]
 deps = -r{toxinidir}/requirements-direct.txt
 whitelist_externals=sh
 commands=
     sh -c "pip freeze | grep -v '^promenade' > {toxinidir}/requirements-frozen.txt"
+
+[testenv:lint]
+deps =
+    yapf
+    flake8
+commands =
+    yapf -rd {toxinidir}/promenade
+    flake8 {toxinidir}/promenade