diff --git a/tests/Makefile.am b/tests/Makefile.am
index 69a6a94be2..b2905876fa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -159,6 +159,7 @@ dist_yaml_TESTS =					\
 	yaml/nl-BE-g1_harness.yaml			\
 	yaml/nl-NL-g0_harness.yaml			\
 	yaml/no_harness.yaml				\
+	yaml/no_typeform_harness.yaml		\
 	yaml/no_g1_harness.yaml				\
 	yaml/no_g2_harness.yaml				\
 	yaml/no_8dot_harness.yaml			\
diff --git a/tests/yaml/Makefile.am b/tests/yaml/Makefile.am
index 1671826a78..27e601f25b 100644
--- a/tests/yaml/Makefile.am
+++ b/tests/yaml/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST =						\
 	no_g1_harness.yaml				\
 	no_g2_harness.yaml				\
 	no_harness.yaml					\
+	no_typeform_harness.yaml			\
 	emphasis-full.yaml				\
 	emphasis-no-context.yaml			\
 	pl-pl-comp8_harness.yaml			\
diff --git a/tests/yaml/no_harness.yaml b/tests/yaml/no_harness.yaml
index 549cfd42e1..afb5a83bfb 100644
--- a/tests/yaml/no_harness.yaml
+++ b/tests/yaml/no_harness.yaml
@@ -726,13 +726,6 @@ tests:
     - 2 Fra engelsk tackle a problem.
     - ⠼⠃ ⠠⠋⠗⠁ ⠑⠝⠛⠑⠇⠎⠅ ⠆⠞⠁⠉⠅⠇⠑ ⠁ ⠏⠗⠕⠃⠇⠑⠍⠰⠄
     - {typeform: {italic: '              ++++++++++++++++ '}}
-  -
-    -           'The quick brown fox jumps...'
-    - # TODO: expected output
-    - typeform:
-        italic: '    +++++++++++++++         '
-        bold:   '          +++++             '
-      xfail: true
   - [ , ' '] # U+2000 (En Quad)
   - [ , ' '] # U+2001 (Em Quad)
   - [ , ' '] # U+2002 (En Space)
diff --git a/tests/yaml/no_typeform_harness.yaml b/tests/yaml/no_typeform_harness.yaml
new file mode 100644
index 0000000000..86bef883c1
--- /dev/null
+++ b/tests/yaml/no_typeform_harness.yaml
@@ -0,0 +1,51 @@
+tables: [unicode.dis, no-no-g0.utb]
+tests:
+  - -              'a b c'
+    - # TODO: expected output
+    - xfail: true
+  - -              'a b c'
+    - # TODO: expected output
+    - typeform:
+        italic:    '  +  '
+      xfail: true
+  - -              'a b c'
+    - # TODO: expected output
+    - typeform:
+        underline: '  +  '
+      xfail: true
+  - -              'a b c'
+    - # TODO: expected output
+    - typeform:
+        italic:    '  +  '
+        underline: '  +  '
+      xfail: true
+  - -              'a b c'
+    - # TODO: expected output
+    - typeform:
+        bold:      '  +  '
+      xfail: true
+  - -              'a b c'
+    - # TODO: expected output
+    - typeform:
+        italic:    '  +  '
+        bold:      '  +  '
+      xfail: true
+  - -              'a b c'
+    - # TODO: expected output
+    - typeform:
+        underline: '  +  '
+        bold:      '  +  '
+      xfail: true
+  - -              'a b c'
+    - # TODO: expected output
+    - typeform:
+        italic:    '  +  '
+        underline: '  +  '
+        bold:      '  +  '
+      xfail: true
+  - -           'The quick brown fox jumps...'
+    - # TODO: expected output
+    - typeform:
+        italic: '    +++++++++++++++         '
+        bold:   '          +++++             '
+      xfail: true