diff --git a/tests/css/parser/Makefile.am b/tests/css/parser/Makefile.am
index 6131b016a3..62dd837276 100644
--- a/tests/css/parser/Makefile.am
+++ b/tests/css/parser/Makefile.am
@@ -54,6 +54,9 @@ EXTRA_DIST += \
 	enum.css \
 	enum.errors \
 	enum.ref.css \
+	font-family.css \
+	font-family.errors \
+	font-family.ref.css \
 	import-cyclic-1.css \
 	import-cyclic-1.errors \
 	import-cyclic-1.ref.css \
diff --git a/tests/css/parser/font-family.css b/tests/css/parser/font-family.css
new file mode 100644
index 0000000000..700fc81aa7
--- /dev/null
+++ b/tests/css/parser/font-family.css
@@ -0,0 +1,65 @@
+a {
+  font-family: none;
+}
+
+b {
+  font-family: Sans Serif;
+}
+
+c {
+  font-family: A Font with a lot of text\2C       spaces        and special characters\2122;
+}
+
+d {
+  font-family: "A Font with a lot of text, spaces and special characters™" ;
+}
+
+e {
+  font-family: A, Lot, Of, Fonts;
+}
+
+f {
+  font-family: "A", "Lot", "Of", "Fonts";
+}
+
+g {
+  font-family: "A Lot", Of, "Fonts";
+}
+
+/* errors straight from the CSS 2.1 spec */
+
+cssa {
+  font-family: Red/Black, sans-serif;
+}
+
+cssb {
+  font-family: "Lucida" Grande, sans-serif;
+}
+
+cssc {
+  font-family: Ahem!, sans-serif;
+}
+
+cssd {
+  font-family: test@foo, sans-serif;
+}
+
+csse {
+  font-family: #POUND, sans-serif;
+}
+
+cssf {
+  font-family: Hawaii 5-0, sans-serif;
+}
+
+/* errors */
+
+ea {
+  font-family: ;
+}
+
+eb {
+  font-family: No comma at the end, please, ;
+}
+
+
diff --git a/tests/css/parser/font-family.errors b/tests/css/parser/font-family.errors
new file mode 100644
index 0000000000..cf0d71a996
--- /dev/null
+++ b/tests/css/parser/font-family.errors
@@ -0,0 +1,8 @@
+font-family.css:32: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+font-family.css:36: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+font-family.css:40: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+font-family.css:44: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+font-family.css:48: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+font-family.css:52: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+font-family.css:58: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
+font-family.css:62: error: GTK_CSS_PROVIDER_ERROR_SYNTAX
diff --git a/tests/css/parser/font-family.ref.css b/tests/css/parser/font-family.ref.css
new file mode 100644
index 0000000000..b770bf489d
--- /dev/null
+++ b/tests/css/parser/font-family.ref.css
@@ -0,0 +1,27 @@
+a {
+  font-family: none;
+}
+
+b {
+  font-family: "Sans Serif";
+}
+
+c {
+  font-family: "A Font with a lot of text, spaces and special characters™";
+}
+
+d {
+  font-family: "A Font with a lot of text, spaces and special characters™";
+}
+
+e {
+  font-family: "A", "Lot", "Of", "Fonts";
+}
+
+f {
+  font-family: "A", "Lot", "Of", "Fonts";
+}
+
+g {
+  font-family: "A Lot", "Of", "Fonts";
+}