diff --git a/elixir-mode-tests.el b/elixir-mode-tests.el
index b56f1609..e8ba7a8a 100644
--- a/elixir-mode-tests.el
+++ b/elixir-mode-tests.el
@@ -22,6 +22,7 @@
 
 (load "test/elixir-mode-indentation-tests.el")
 (load "test/elixir-mode-tokenizer-hl-tests.el")
+(load "test/elixir-mode-font-tests.el")
 
 (provide 'elixir-mode-tests)
 ;;; elixir-mode-tests.el ends here
diff --git a/run_tests b/run_tests
index 7bb4f19d..4dadf977 100755
--- a/run_tests
+++ b/run_tests
@@ -17,7 +17,7 @@ else
                 break
                 ;;
             *)
-                emacs -l elixir-mode-tests.el -f elixir-mode-run-tests
+                emacs -l elixir-mode-tests.el -f ert-run-tests-interactively
                 break
                 ;;
         esac
diff --git a/test/elixir-mode-font-tests.el b/test/elixir-mode-font-tests.el
new file mode 100644
index 00000000..f9a985e0
--- /dev/null
+++ b/test/elixir-mode-font-tests.el
@@ -0,0 +1,45 @@
+;; `elixir-test-with-temp-buffer' and `elixir-test-face-at' are both slightly
+;; modified versions of the original at
+;; https://github.com/lunaryorn/puppet-mode/blob/master/test/puppet-mode-test.el
+(defmacro elixir-test-with-temp-buffer (content &rest body)
+  "Evaluate BODY in a temporary buffer with CONTENTS."
+  (declare (debug t)
+           (indent 1))
+  `(with-temp-buffer
+     (insert ,content)
+     (elixir-mode)
+     (font-lock-fontify-buffer)
+     (goto-char (point-min))
+     ,@body))
+
+(defun elixir-test-face-at (pos &optional content)
+  "Get the face at POS in CONTENT.
+
+If CONTENT is not given, return the face at POS in the current
+buffer."
+  (if content
+      (elixir-test-with-temp-buffer content
+        (get-text-property pos 'face))
+    (get-text-property pos 'face)))
+
+(ert-deftest elixir-mode-syntax-table/fontify-regex ()
+  :tags '(fontification syntax-table)
+  (elixir-test-with-temp-buffer
+   "match = ~r/foo/"
+   (should (eq (elixir-test-face-at 1) 'font-lock-variable-name-face))
+   (should (eq (elixir-test-face-at 9) 'font-lock-builtin-face))))
+
+(ert-deftest elixir-mode-syntax-table/fontify-modules-and-types ()
+  :tags '(fontification syntax-table)
+  (elixir-test-with-temp-buffer
+   "defmodule Application.Behavior do
+  use Application.Behaviour"
+   (should (eq (elixir-test-face-at 1) 'font-lock-keyword-face))
+   (should (eq (elixir-test-face-at 11) 'font-lock-type-face))
+   (should (eq (elixir-test-face-at 22) 'font-lock-type-face))
+   (should (eq (elixir-test-face-at 23) 'font-lock-type-face))
+   (should (eq (elixir-test-face-at 32) 'font-lock-keyword-face))
+   (should (eq (elixir-test-face-at 37) 'font-lock-keyword-face))
+   (should (eq (elixir-test-face-at 41) 'font-lock-type-face))
+   (should (eq (elixir-test-face-at 52) 'font-lock-type-face))
+   (should (eq (elixir-test-face-at 53) 'font-lock-type-face))))