diff --git a/pillar/tests/config_testing.py b/pillar/tests/config_testing.py
index 75f5a0aa..ba9b1870 100644
--- a/pillar/tests/config_testing.py
+++ b/pillar/tests/config_testing.py
@@ -44,3 +44,5 @@ ELASTIC_INDICES = {
 
 # MUST be 8 characters long, see pillar.flask_extra.HashedPathConverter
 STATIC_FILE_HASH = 'abcd1234'
+
+CACHE_NO_NULL_WARNING = True
diff --git a/src/styles/font-pillar.sass b/src/styles/font-pillar.sass
index 11cd3c06..905d5410 100644
--- a/src/styles/font-pillar.sass
+++ b/src/styles/font-pillar.sass
@@ -1,7 +1,9 @@
+/* So it's possible to override the path before importing font-pillar.sass */
+$pillar-font-path: "../font" !default
+
 @font-face
   font-family: 'pillar-font'
-  src: url('../font/pillar-font.eot?55726379')
-  src: url('../font/pillar-font.eot?55726379#iefix') format("embedded-opentype"), url('../font/pillar-font.woff2?55726379') format("woff2"), url('../font/pillar-font.woff?55726379') format("woff")
+  src: url('#{$pillar-font-path}/pillar-font.woff?55726379') format("woff"), url('#{$pillar-font-path}/pillar-font.woff2?55726379') format("woff2")
   font-weight: normal
   font-style: normal