diff --git a/layout/reftests/w3c-css/submitted/text3/hyphenation-control-1-ref.html b/layout/reftests/w3c-css/submitted/text3/hyphenation-control-1-ref.html
new file mode 100644
index 000000000000..b9abe2505d67
--- /dev/null
+++ b/layout/reftests/w3c-css/submitted/text3/hyphenation-control-1-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text 6.1. Hyphenation Control: the hyphens property</title>
+<link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org">
+<style>
+code {
+  display:block;
+  hyphens:manual;
+  border: 1px solid black;
+}
+</style>
+</head>
+<body lang="en-us">
+<!--
+  Hyphenation opportunities of the texts in this test are as follows,
+
+        frag[A]ilis[A]tic[C]ex[A]pi[A]ali
+
+  where [A] is an automatic hyphen, and [C] is a conditional hyphen.
+
+  In this test, we set width to somewhere after the conditional hyphen,
+  then we see if automatic hyphen breaks are ignored correctly.
+-->
+<code style="width:12ch;">
+fragilistic-<br />expiali
+</code>
+<br />
+<code style="width:14ch;">
+fragilistic-<br />expiali
+</code>
+<br />
+<code style="width:16ch;">
+fragilistic-<br />expiali
+</code>
+</body>
+</html>
diff --git a/layout/reftests/w3c-css/submitted/text3/hyphenation-control-1.html b/layout/reftests/w3c-css/submitted/text3/hyphenation-control-1.html
new file mode 100644
index 000000000000..957dcc9ff169
--- /dev/null
+++ b/layout/reftests/w3c-css/submitted/text3/hyphenation-control-1.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text 6.1. Hyphenation Control: the hyphens property</title>
+<link rel="author" title="Chun-Min (Jeremy) Chen" href="mailto:jeremychen@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org">
+<link rel="match" href="hyphenation-control-1-ref.html">
+<meta name="assert" content="Test checks that automatic hyphenation opportunities within a word
+must be ignored if the word contains a conditional hyphen (&shy; or U+00AD), in favor of the
+conditional hyphen(s).">
+<style>
+code {
+  display:block;
+  hyphens:auto;
+  border: 1px solid black;
+}
+</style>
+</head>
+<body lang="en-us">
+<!--
+  Hyphenation opportunities of the texts in this test are as follows,
+
+        frag[A]ilis[A]tic[C]ex[A]pi[A]ali
+
+  where [A] is an automatic hyphen, and [C] is a conditional hyphen.
+
+  In this test, we set width to somewhere after the conditional hyphen,
+  then we see if automatic hyphen breaks are ignored correctly.
+-->
+<code style="width:12ch;">
+fragilistic&shy;expiali
+</code>
+<br />
+<code style="width:14ch;">
+fragilistic&shy;expiali
+</code>
+<br />
+<code style="width:16ch;">
+fragilistic&shy;expiali
+</code>
+</body>
+</html>
diff --git a/layout/reftests/w3c-css/submitted/text3/reftest.list b/layout/reftests/w3c-css/submitted/text3/reftest.list
index b8e0f31db1ed..0ba99ad97e1d 100644
--- a/layout/reftests/w3c-css/submitted/text3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/text3/reftest.list
@@ -12,6 +12,8 @@ pref(layout.css.text-justify.enabled,true) == text-justify-distribute-001.html t
 
 == text-word-spacing-001.html text-word-spacing-ref.html
 
+== hyphenation-control-1.html hyphenation-control-1-ref.html
+
 == segment-break-transformation-removable-1.html segment-break-transformation-removable-ref.html
 == segment-break-transformation-removable-2.html segment-break-transformation-removable-ref.html
 == segment-break-transformation-removable-3.html segment-break-transformation-removable-ref.html
