diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 3b9857035..b307cd123 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -36,6 +36,7 @@ TEST_PROGS = \
 	test-font \
 	test-map \
 	test-object \
+	test-ot-face \
 	test-set \
 	test-shape \
 	test-subset \
diff --git a/test/api/test-ot-face.c b/test/api/test-ot-face.c
new file mode 100644
index 000000000..0af584e05
--- /dev/null
+++ b/test/api/test-ot-face.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2011  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#include "hb-test.h"
+#include <hb-ot.h>
+
+/* Unit tests for hb-ot-*.h */
+
+
+static void
+test_ot_face_empty (void)
+{
+  hb_face_t *face = hb_face_get_empty ();
+  hb_font_t *font = hb_font_create (face);
+  hb_set_t *set = hb_set_create ();
+
+  hb_face_collect_unicodes (face, set);
+  hb_face_collect_variation_selectors (face, set);
+  hb_face_collect_variation_unicodes (face, 0, set);
+
+  hb_ot_color_has_palettes (face);
+  hb_ot_color_palette_get_count (face);
+  hb_ot_color_palette_get_name_id (face, 0);
+  hb_ot_color_palette_color_get_name_id (face, 0);
+  hb_ot_color_palette_get_flags (face, 0);
+  hb_ot_color_palette_get_colors (face, 0, 0, NULL, NULL);
+  hb_ot_color_has_layers (face);
+  hb_ot_color_glyph_get_layers (face, 0, 0, NULL, NULL);
+  hb_ot_color_has_svg (face);
+  hb_ot_color_glyph_reference_svg (face, 0);
+  hb_ot_color_has_png (face);
+  hb_ot_color_glyph_reference_png (font, 0);
+
+  hb_ot_layout_has_glyph_classes (face);
+  hb_ot_layout_has_substitution (face);
+  hb_ot_layout_has_positioning (face);
+
+  hb_ot_math_has_data (face);
+  hb_ot_math_get_constant (font, 0);
+  hb_ot_math_get_glyph_italics_correction (font, 0);
+  hb_ot_math_get_glyph_top_accent_attachment (font, 0);
+  hb_ot_math_is_glyph_extended_shape (face, 0);
+  hb_ot_math_get_glyph_kerning (font, 0, 0, 0);
+  hb_ot_math_get_glyph_variants (font, 0, 0, 0, NULL, NULL);
+  hb_ot_math_get_min_connector_overlap (font, 0);
+  hb_ot_math_get_glyph_assembly (font, 0, 0, 0, NULL, NULL, NULL);
+
+  hb_ot_name_list_names (face, NULL);
+  hb_ot_name_get_utf8 (face, 0, NULL, NULL, NULL);
+  hb_ot_name_get_utf16 (face, 0, NULL, NULL, NULL);
+  hb_ot_name_get_utf32 (face, 0, NULL, NULL, NULL);
+
+  hb_ot_var_get_axis_count (face);
+  hb_ot_var_get_axes (face, 0, NULL, NULL);
+  hb_ot_var_normalize_variations (face, NULL, 0, NULL, 0);
+  hb_ot_var_normalize_coords (face, 0, NULL, NULL);
+
+  hb_set_destroy (set);
+  hb_font_destroy (font);
+  hb_face_destroy (face);
+}
+
+int
+main (int argc, char **argv)
+{
+  hb_test_init (&argc, &argv);
+
+  hb_test_add (test_ot_face_empty);
+
+  return hb_test_run();
+}