diff --git a/Makefile b/Makefile
index 1043fbe..d166862 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@
 
 all:
 	@echo "make install - Install into DESTDIR"
+	@echo "make lint    - Run lint tests"
 	@echo "make test    - Run tests"
 	@echo "make kitchen - Run Kitchen CI tests (create, converge, verify)"
 	@echo "make clean   - Cleanup after tests run"
@@ -45,6 +46,9 @@
 	[ -d $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME) ] || mkdir -p $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME)
 	cp -a metadata/service/* $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME)
 
+lint:
+	[ ! -d tests ] || (cd tests; ./run_tests.sh lint)
+
 test:
 	[ ! -d tests ] || (cd tests; ./run_tests.sh)
 
@@ -65,7 +69,7 @@
 	[ ! -f debian/changelog ] || dch -v $(VERSION_MAJOR).$(NEW_MINOR_VERSION) -m --force-distribution -D `dpkg-parsechangelog -S Distribution` "New version"
 	make genchangelog-$(VERSION_MAJOR).$(NEW_MINOR_VERSION)
 	(git add -u; git commit -m "Version $(VERSION_MAJOR).$(NEW_MINOR_VERSION)")
-	git tag -s -m $(NEW_MAJOR_VERSION) $(VERSION_MAJOR).$(NEW_MINOR_VERSION)
+	git tag -s -m $(VERSION_MAJOR).$(NEW_MINOR_VERSION) $(VERSION_MAJOR).$(NEW_MINOR_VERSION)
 
 check-changes:
 	@git log --pretty=oneline --decorate $(VERSION)..HEAD | grep -Eqc '.*' || (echo "No new changes since version $(VERSION)"; exit 1)
diff --git a/ceilometer/agent.sls b/ceilometer/agent.sls
index c77f0e2..1e2769f 100644
--- a/ceilometer/agent.sls
+++ b/ceilometer/agent.sls
@@ -58,7 +58,7 @@
 
 {% endif %}
 
-{%- for publisher_name, publisher in agent.get('publisher', {}).iteritems() %}
+{%- for publisher_name, publisher in agent.get('publisher', {}).items() %}
 
 {%- if publisher_name != "default" %}
 
diff --git a/ceilometer/files/juno/ceilometer-server.conf.Debian b/ceilometer/files/juno/ceilometer-server.conf.Debian
index 6a64874..ff31fb9 100644
--- a/ceilometer/files/juno/ceilometer-server.conf.Debian
+++ b/ceilometer/files/juno/ceilometer-server.conf.Debian
@@ -928,7 +928,7 @@
 #metering_secret=change this or be hacked
 metering_secret={{ server.secret }}
 
-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %}
+{%- for publisher_name, publisher in server.get('publisher', {}).items() %}
 {%- if publisher_name == 'graphite' %}
 
 graphite=ceilometer.publisher.graphite:GraphitePublisher
diff --git a/ceilometer/files/juno/pipeline.yaml b/ceilometer/files/juno/pipeline.yaml
index c387a84..0f1a19b 100644
--- a/ceilometer/files/juno/pipeline.yaml
+++ b/ceilometer/files/juno/pipeline.yaml
@@ -41,7 +41,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -59,7 +59,7 @@
                     type: "gauge"
                     scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -81,7 +81,7 @@
                         unit: "\\1/s"
                     type: "gauge"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -103,7 +103,7 @@
                         unit: "\\1/s"
                     type: "gauge"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
diff --git a/ceilometer/files/kilo/ceilometer-server.conf.Debian b/ceilometer/files/kilo/ceilometer-server.conf.Debian
index 25f633a..20ee1c7 100644
--- a/ceilometer/files/kilo/ceilometer-server.conf.Debian
+++ b/ceilometer/files/kilo/ceilometer-server.conf.Debian
@@ -408,7 +408,7 @@
 #metering_secret=change this or be hacked
 telemetry_secret={{ server.secret }}
 
-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %}
+{%- for publisher_name, publisher in server.get('publisher', {}).items() %}
 {%- if publisher_name == 'graphite' %}
 
 graphite=ceilometer.publisher.graphite:GraphitePublisher
diff --git a/ceilometer/files/kilo/pipeline.yaml b/ceilometer/files/kilo/pipeline.yaml
index 8ca9719..5299c55 100644
--- a/ceilometer/files/kilo/pipeline.yaml
+++ b/ceilometer/files/kilo/pipeline.yaml
@@ -45,7 +45,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -63,7 +63,7 @@
                     type: "gauge"
                     scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -85,7 +85,7 @@
                         unit: "\\1/s"
                     type: "gauge"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -107,7 +107,7 @@
                         unit: "\\1/s"
                     type: "gauge"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
diff --git a/ceilometer/files/liberty/ceilometer-server.conf.Debian b/ceilometer/files/liberty/ceilometer-server.conf.Debian
index 9b364c8..c80cbb5 100644
--- a/ceilometer/files/liberty/ceilometer-server.conf.Debian
+++ b/ceilometer/files/liberty/ceilometer-server.conf.Debian
@@ -409,7 +409,7 @@
 #metering_secret=change this or be hacked
 telemetry_secret={{ server.secret }}
 
-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %}
+{%- for publisher_name, publisher in server.get('publisher', {}).items() %}
 {%- if publisher_name == 'graphite' %}
 
 graphite=ceilometer.publisher.graphite:GraphitePublisher
diff --git a/ceilometer/files/liberty/pipeline.yaml b/ceilometer/files/liberty/pipeline.yaml
index 0bc964d..dff8a48 100644
--- a/ceilometer/files/liberty/pipeline.yaml
+++ b/ceilometer/files/liberty/pipeline.yaml
@@ -46,7 +46,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -64,7 +64,7 @@
                     type: "gauge"
                     scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -95,7 +95,7 @@
                         unit: "\\1/s"
                     type: "gauge"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
@@ -117,7 +117,7 @@
                         unit: "\\1/s"
                     type: "gauge"
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
diff --git a/ceilometer/files/mitaka/ceilometer-server.conf.Debian b/ceilometer/files/mitaka/ceilometer-server.conf.Debian
index e695903..79cb291 100644
--- a/ceilometer/files/mitaka/ceilometer-server.conf.Debian
+++ b/ceilometer/files/mitaka/ceilometer-server.conf.Debian
@@ -312,7 +312,7 @@
 #metering_secret=change this or be hacked
 telemetry_secret={{ server.secret }}
 
-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %}
+{%- for publisher_name, publisher in server.get('publisher', {}).items() %}
 {%- if publisher_name == 'graphite' %}
 
 graphite=ceilometer.publisher.graphite:GraphitePublisher
diff --git a/ceilometer/files/mitaka/compute_pipeline.yaml b/ceilometer/files/mitaka/compute_pipeline.yaml
index 73caba1..e04dc9d 100644
--- a/ceilometer/files/mitaka/compute_pipeline.yaml
+++ b/ceilometer/files/mitaka/compute_pipeline.yaml
@@ -17,7 +17,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'graphite' %}
           - graphite://{{ publisher.host }}:{{ publisher.port }}
           {%- else %}
diff --git a/ceilometer/files/mitaka/pipeline.yaml b/ceilometer/files/mitaka/pipeline.yaml
index 6fa518b..247a46a 100644
--- a/ceilometer/files/mitaka/pipeline.yaml
+++ b/ceilometer/files/mitaka/pipeline.yaml
@@ -27,7 +27,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
diff --git a/ceilometer/files/newton/compute_pipeline.yaml b/ceilometer/files/newton/compute_pipeline.yaml
index 73caba1..e04dc9d 100644
--- a/ceilometer/files/newton/compute_pipeline.yaml
+++ b/ceilometer/files/newton/compute_pipeline.yaml
@@ -17,7 +17,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'graphite' %}
           - graphite://{{ publisher.host }}:{{ publisher.port }}
           {%- else %}
diff --git a/ceilometer/files/newton/pipeline.yaml b/ceilometer/files/newton/pipeline.yaml
index 058e3cf..4bf2f6c 100644
--- a/ceilometer/files/newton/pipeline.yaml
+++ b/ceilometer/files/newton/pipeline.yaml
@@ -17,7 +17,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
diff --git a/ceilometer/files/ocata/compute_pipeline.yaml b/ceilometer/files/ocata/compute_pipeline.yaml
index 73caba1..e04dc9d 100644
--- a/ceilometer/files/ocata/compute_pipeline.yaml
+++ b/ceilometer/files/ocata/compute_pipeline.yaml
@@ -17,7 +17,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'graphite' %}
           - graphite://{{ publisher.host }}:{{ publisher.port }}
           {%- else %}
diff --git a/ceilometer/files/ocata/pipeline.yaml b/ceilometer/files/ocata/pipeline.yaml
index 058e3cf..4bf2f6c 100644
--- a/ceilometer/files/ocata/pipeline.yaml
+++ b/ceilometer/files/ocata/pipeline.yaml
@@ -17,7 +17,7 @@
     - name: meter_sink
       transformers:
       publishers:
-          {%- for publisher_name, publisher in publisher.iteritems() %}
+          {%- for publisher_name, publisher in publisher.items() %}
           {%- if publisher_name == 'default' %}
           - notifier://
           {%- endif %}
diff --git a/ceilometer/server.sls b/ceilometer/server.sls
index 196f478..d32cca7 100644
--- a/ceilometer/server.sls
+++ b/ceilometer/server.sls
@@ -87,7 +87,7 @@
 
 {%- endif %}
 
-{%- for name, rule in server.get('policy', {}).iteritems() %}
+{%- for name, rule in server.get('policy', {}).items() %}
 
 {%- if rule != None %}
 rule_{{ name }}_present:
@@ -111,7 +111,7 @@
 
 {%- endfor %}
 
-{%- for publisher_name, publisher in server.get('publisher', {}).iteritems() %}
+{%- for publisher_name, publisher in server.get('publisher', {}).items() %}
 
 {%- if publisher_name != "default" %}