diff --git a/.gitignore b/.gitignore
index 0b5a2a6..42d76c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.pyc
 *.egg-info
+*~
+*.swp
 
 build/
 bootstrap3
@@ -10,3 +12,5 @@ manage.py
 
 .tox
 test_venv
+.coverage
+htmlcov/
diff --git a/Makefile b/Makefile
index e5b19f1..df1a6a6 100644
--- a/Makefile
+++ b/Makefile
@@ -44,3 +44,8 @@ test_project: test_venv test_venv/cas/manage.py
 
 run_test_server: test_project
 	test_venv/bin/python test_venv/cas/manage.py runserver
+
+coverage: test_venv
+	test_venv/bin/pip install coverage
+	test_venv/bin/coverage run --source='cas_server' run_tests
+	test_venv/bin/coverage html