diff --git a/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py b/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py
index ac22523a637..1ab6f5f7391 100644
--- a/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py
+++ b/cluster/juju/layers/kubernetes-e2e/reactive/kubernetes_e2e.py
@@ -14,14 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
 from charms import layer
 from charms.layer import snap
 
 from charms.reactive import hook
 from charms.reactive import is_state
-from charms.reactive import remove_state
 from charms.reactive import set_state
 from charms.reactive import when
 from charms.reactive import when_not
@@ -30,7 +27,6 @@ from charmhelpers.core import hookenv
 
 from shlex import split
 
-from subprocess import call
 from subprocess import check_call
 from subprocess import check_output
 
diff --git a/cluster/juju/layers/kubernetes-master/Makefile b/cluster/juju/layers/kubernetes-master/Makefile
new file mode 100644
index 00000000000..411669abf79
--- /dev/null
+++ b/cluster/juju/layers/kubernetes-master/Makefile
@@ -0,0 +1,25 @@
+#!/usr/bin/make
+
+all: lint unit_test
+
+
+.PHONY: clean
+clean:
+	@rm -rf .tox
+
+.PHONY: apt_prereqs
+apt_prereqs:
+	@# Need tox, but don't install the apt version unless we have to (don't want to conflict with pip)
+	@which tox >/dev/null || (sudo pip install tox)
+	@sudo apt-get install -y python-pip python-flake8 python3-flake8 flake8
+
+.PHONY: lint
+lint: apt_prereqs
+	@tox --notest
+	@flake8 $(wildcard hooks reactive lib unit_tests tests)
+	@charm proof
+
+.PHONY: unit_test
+unit_test: apt_prereqs
+	@echo Starting tests...
+	tox
diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
index c840bbc93f0..fbe2b45af79 100644
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -441,7 +441,6 @@ def addons_ready():
         return False
 
 
-
 @when('loadbalancer.available', 'certificates.ca.available',
       'certificates.client.cert.available')
 def loadbalancer_kubeconfig(loadbalancer, ca, client):