diff --git a/Makefile b/Makefile
index 2351259..2ce21e9 100644
--- a/Makefile
+++ b/Makefile
@@ -19,4 +19,12 @@ vendor: composer.json composer.lock
 node_modules: package.json
 	npm install
 
-.PHONY: build-assets
+unit-tests: ## Run unit tests
+	vendor/bin/phpunit
+
+lint:
+	bin/console lint:twig templates/
+
+test: unit-tests lint
+
+.PHONY: help install build-assets unit-tests lint test
diff --git a/circle.yml b/circle.yml
index 24b1557..0240ecd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,7 +13,7 @@ dependencies:
 
 test:
     override:
-        - ./vendor/bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit.xml
+        - make test
 
 deployment:
     production:
diff --git a/templates/event_checkin.html.twig b/templates/event_checkin.html.twig
index 731d4f2..87c5d8e 100644
--- a/templates/event_checkin.html.twig
+++ b/templates/event_checkin.html.twig
@@ -13,7 +13,7 @@
             <div data-user-id="{{ rsvp.id }}"
                  data-user-name="{{ rsvp.name }}"
                  class="rsvp {{ rsvp.id in checkins or rsvp.host ? 'checked_in':'not_checked_in' }}"
-                 style="background-image: url('{{ rsvp.photo.photo_link|default(asset('assets/avatar.png') }}');"
+                 style="background-image: url('{{ rsvp.photo.photo_link|default(asset('assets/avatar.png')) }}');"
 
             >
                 <span class="name">{{ rsvp.name }}</span>