diff --git a/.travis.yml b/.travis.yml
index 9a4390b..e26c522 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 sudo: false
 
-language: python
+language: 'python'
 
 install:
   - 'pip install awscli'
 
 script:
-  - 'for template in $(ls *.yml); do aws cloudformation validate-template --template-body file://$template; done'
+  - 'make test'
 
 before_deploy:
   - 'mkdir -p templates'
diff --git a/Makefile b/Makefile
index 2c9ce93..adaa0e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
-.PHONY: list-instance-types list-latest-amis
+.PHONY: list-instance-types list-latest-amis test
+
+test:
+	@for template in $$(ls *.yml); do \
+		aws cloudformation validate-template --template-body file://$$template; \
+	done
 
 list-instance-types:
 	@instance_types=$$( \