diff --git a/Makefile b/Makefile
index 90c9540..8bb1aaa 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ venv_dev: requirements/dev.txt
 		pip3 install -r ./requirements/dev.txt | tee install.log
 ###################################
 
-test:
+test: test_templates
 	RESULTS=$(RESULTS) pytest-3 -ra --junitxml=$(RESULTS)/junit.xml \
 		--cov=. --cov-report=xml:$(RESULTS)/coverage.xml --pep8
 
@@ -25,6 +25,9 @@ test_pylint:
 	RESULTS=$(RESULTS) pytest-3 --junitxml=$(RESULTS)/junit.xml \
 		--pylint --pylint-rcfile=pylint.cfg --pylint-jobs=4
 
+test_templates:
+	./manage.py validate_templates --settings="repoapi.settings.test"
+
 ###################################
 
 deploy: venv_prod
diff --git a/repoapi/settings/common.py b/repoapi/settings/common.py
index 60fd85b..8139f5a 100644
--- a/repoapi/settings/common.py
+++ b/repoapi/settings/common.py
@@ -35,6 +35,7 @@ INSTALLED_APPS = [
     "django_celery_results",
     "django_extensions",
     "django_filters",
+    "crispy_forms",
     "jsonify",
     "import_export",
     "hotfix",
diff --git a/requirements/common.txt b/requirements/common.txt
index efd8cb8..fdcd7cc 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -4,6 +4,7 @@ django-appconf
 django-assets
 django-celery-beat
 django-celery-results
+django-crispy-forms
 django-extensions
 django-filter
 django-import-export
diff --git a/t/Dockerfile b/t/Dockerfile
index 002d853..2cf980d 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -5,7 +5,7 @@ FROM docker.mgm.sipwise.com/sipwise-bullseye:latest
 # is updated with the current date. It will force refresh of all
 # of the base images and things like `apt-get update` won't be using
 # old cached versions when the Dockerfile is built.
-ENV REFRESHED_AT 2022-01-21
+ENV REFRESHED_AT 2022-01-22
 
 RUN apt-get update && apt-get install --assume-yes python3 python3-dev \
 	python3-pytest python3-pytest-pep8 \