diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-001.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-001.xht
index 2276557c871f..3f8782580168 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-001.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-001.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="An @supports rule condition with a single, valid property declaration for a supported property must cause the rules inside the @supports rule to apply."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: green) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-002.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-002.xht
index dbe152a76e2d..48326acb7eed 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-002.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-002.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="Property declarations in an @supports rule condition must be surrounded by parentheses."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports color: green {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-003.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-003.xht
index 70a87906abe2..4e01f5369944 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-003.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-003.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="Any subexpression in an @supports rule condition can be surrounded by an extra pair of parentheses."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports ((color: green)) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-004.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-004.xht
index c5def52be7e1..7c4ad818b4f7 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-004.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-004.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="Property declarations in an @supports rule can have !important specified."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: green !important) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-005.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-005.xht
index 0fa36f180933..c184d70df7c0 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-005.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-005.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax but a failing condition must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A supported property with an unsupported value must cause the @supports condition to fail."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (color: rainbow) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-006.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-006.xht
index f6a8aaaf3b98..faf8f68f6433 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-006.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-006.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A disjunction of two @supports conditions must cause the @supports condition to pass if the left condition passes."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: rainbow) or (color: green) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-007.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-007.xht
index c0bc03e0aaaa..716b15232b98 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-007.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-007.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A disjunction of two @supports conditions must cause the @supports condition to pass if the right condition passes."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: green) or (color: rainbow) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-008.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-008.xht
index ca31e171694c..80596a9d466b 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-008.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-008.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A conjunction of two @supports conditions must cause the @supports condition to pass if both sub-conditions pass."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: green) and (color: blue) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-009.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-009.xht
index 9e01be44a9a6..31fffbe7146d 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-009.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-009.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax but a failing condition must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A conjunction of two @supports conditions must cause the @supports condition to fail if the left sub-condition passes."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (color: rainbow) and (color: blue) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-010.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-010.xht
index 1b3d62c690f7..17b8810f1409 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-010.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-010.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax but a failing condition must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A conjunction of two @supports conditions must cause the @supports condition to fail if the right sub-condition passes."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (color: blue) and (color: rainbow) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-011.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-011.xht
index 4f0728c10756..d70cc0054233 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-011.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-011.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A disjunction of three @supports conditions must cause the @supports condition to pass if at least one of the sub-conditions passes."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: rainbow) or (color: iridescent) or (color: green) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-012.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-012.xht
index e0dccf5ce1bf..c9ff483a51df 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-012.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-012.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A conjunction of three @supports conditions must cause the @supports condition to pass if all three sub-conditions pass."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: red) and (color: green) and (color: blue) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-013.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-013.xht
index 145c7adb3d9d..2c0b62e61640 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-013.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-013.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="A disjunction and a conjunction of @supports conditions must not be combined unless one of the two is surrounded by parentheses."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (color: green) and (color: green) or (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-014.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-014.xht
index 9713d04fa70d..90c3bb4e33e0 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-014.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-014.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="A disjunction and a conjunction of @supports conditions must not be combined unless one of the two is surrounded by parentheses."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (color: green) or (color: green) and (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-015.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-015.xht
index 8bef7b2698db..8a696fdff8d2 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-015.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-015.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="There need not be any white space between the '@supports' and open brace of the rule set, not between a declaration's property name and value."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports(color:green){
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-016.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-016.xht
index bc903a071c6b..bad6053133ae 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-016.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-016.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A negation of an @supports condition must pass if and only if the sub-condition fails.  The sub-condition here is a supported property name with an unsupported value."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports not (color: rainbow) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-017.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-017.xht
index e80fef44c637..92b8d04e7f24 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-017.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-017.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="The sub-condition of a negation in an @supports condition must be in parentheses."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports not not (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-018.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-018.xht
index b8b4b6a32e3e..2019a2a7cb1b 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-018.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-018.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="The sub-condition of a negation in an @supports condition must be in parentheses."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports not (not (color: green)) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-019.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-019.xht
index 583c7496e99f..109c8528ba54 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-019.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-019.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="A conjunction in an @supports condition must have both sub-conditions enclosed in parentheses."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports not (color: rainbow) and not (color: iridescent) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-020.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-020.xht
index 075b39be3065..e6d5a1111d22 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-020.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-020.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax but a failing condition must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="An @supports condition that is a declaration with a supported property name with an unsupported value must fail."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (unknown: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-021.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-021.xht
index 5796507b7691..df98d12068ee 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-021.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-021.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax but a failing condition must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A disjunction of two @supports conditions must cause the @supports condition to pass if one condition passes and the other fails due to being an unsupported property."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (unknown: green) or (color: green) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht
index 3cdb63515609..a451cd9fd1ec 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-022.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="An @supports conditions must fail to parse if a declaration has an empy property value."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (unknown:) or (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-023.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-023.xht
index 82279f441ce9..b620b109c90f 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-023.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-023.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="A property declaration in an @supports declaration must not omit the colon between the property name and value."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (unknown) or (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-024.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-024.xht
index 8c7ad4917040..de2baf3953fe 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-024.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-024.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A supported shorthand property declaration must be considered to pass."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (font: 16px serif) {
       html { background-color: green }
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-025.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-025.xht
index 7a27916b110d..7a766146e556 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-025.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-025.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: A nested @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="An inner @supports rule inside an outer @supports must apply its child rules only if both @supports conditions succeeded."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: green) {
       @supports (color: blue) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-026.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-026.xht
index 643cdcd3c73d..920143e79766 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-026.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-026.xht
@@ -3,11 +3,11 @@
  <head>
   <title>CSS Test: A nested @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-media" />
   <meta name="flags" content="" />
   <meta name="assert" content="An outer @supports rule with an inner @media rule must apply the rules inside the @media only if both the @supports and @media conditions pass."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: green) {
       @media all {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-027.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-027.xht
index 58dcd3755263..b3d8349e9720 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-027.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-027.xht
@@ -3,11 +3,11 @@
  <head>
   <title>CSS Test: A nested @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-document" />
   <meta name="flags" content="" />
   <meta name="assert" content="An outer @document rule with an inner @supports rule must apply the rules inside the @supports only if both the @supports and @document conditions pass."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @-moz-document url-prefix("") {
       @supports (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-028.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-028.xht
index f72793b5ec4d..dd506dfcdab3 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-028.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-028.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: A nested @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="An inner @document rule with an outer @supports rule must apply the rules inside the @document only if both the @supports and @document conditions pass."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     @supports (color: green) {
       @-moz-document url-prefix("") {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-029.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-029.xht
index a63bfb6811a3..0d1bb589afc4 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-029.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-029.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A disjunction in an @supports condition must have both sub-conditions enclosed in parentheses." />
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports not (color: rainbow) or (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-030.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-030.xht
index e5aebaf966b5..6c087b8b0ac6 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-030.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-030.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with valid syntax and a passing condition must apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
   <meta name="flags" content="" />
   <meta name="assert" content="A disjunction in an @supports condition must have both sub-conditions enclosed in parentheses." />
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (not (color: rainbow) or (color: green)) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht b/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht
index 1df87995aaf6..85c582536944 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht
+++ b/layout/reftests/w3c-css/submitted/conditional3/css-supports-031.xht
@@ -3,10 +3,10 @@
  <head>
   <title>CSS Test: An @supports rule with invalid syntax must not apply rules inside it</title>
   <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au" />
-  <link rel="help" href="http://www.w3.org/TR/#at-supports" />
-  <meta name="flags" content="" />
+  <link rel="help" href="http://www.w3.org/TR/css3-conditional/#at-supports" />
+  <meta name="flags" content="invalid" />
   <meta name="assert" content="An @supports conditions must fail to parse if a declaration has an empy property value."/>
-  <link rel="match" href="pass.html" />
+  <link rel="match" href="support/pass.xht" />
   <style type="text/css"><![CDATA[
     html { background-color: green }
     @supports (color:) or (color: green) {
diff --git a/layout/reftests/w3c-css/submitted/conditional3/pass.html b/layout/reftests/w3c-css/submitted/conditional3/pass.html
deleted file mode 100644
index 683938b40a68..000000000000
--- a/layout/reftests/w3c-css/submitted/conditional3/pass.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<style>
-html { background-color: green }
-</style>
diff --git a/layout/reftests/w3c-css/submitted/conditional3/reftest.list b/layout/reftests/w3c-css/submitted/conditional3/reftest.list
index bf22315fc069..cdf0e2dbbf41 100644
--- a/layout/reftests/w3c-css/submitted/conditional3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/conditional3/reftest.list
@@ -1,31 +1,31 @@
-== css-supports-001.xht pass.html
-== css-supports-002.xht pass.html
-== css-supports-003.xht pass.html
-== css-supports-004.xht pass.html
-== css-supports-005.xht pass.html
-== css-supports-006.xht pass.html
-== css-supports-007.xht pass.html
-== css-supports-008.xht pass.html
-== css-supports-009.xht pass.html
-== css-supports-010.xht pass.html
-== css-supports-011.xht pass.html
-== css-supports-012.xht pass.html
-== css-supports-013.xht pass.html
-== css-supports-014.xht pass.html
-== css-supports-015.xht pass.html
-== css-supports-016.xht pass.html
-== css-supports-017.xht pass.html
-== css-supports-018.xht pass.html
-== css-supports-019.xht pass.html
-== css-supports-020.xht pass.html
-== css-supports-021.xht pass.html
-== css-supports-022.xht pass.html
-== css-supports-023.xht pass.html
-== css-supports-024.xht pass.html
-== css-supports-025.xht pass.html
-== css-supports-026.xht pass.html
-== css-supports-027.xht pass.html
-== css-supports-028.xht pass.html
-== css-supports-029.xht pass.html
-== css-supports-030.xht pass.html
-== css-supports-031.xht pass.html
+== css-supports-001.xht support/pass.xht
+== css-supports-002.xht support/pass.xht
+== css-supports-003.xht support/pass.xht
+== css-supports-004.xht support/pass.xht
+== css-supports-005.xht support/pass.xht
+== css-supports-006.xht support/pass.xht
+== css-supports-007.xht support/pass.xht
+== css-supports-008.xht support/pass.xht
+== css-supports-009.xht support/pass.xht
+== css-supports-010.xht support/pass.xht
+== css-supports-011.xht support/pass.xht
+== css-supports-012.xht support/pass.xht
+== css-supports-013.xht support/pass.xht
+== css-supports-014.xht support/pass.xht
+== css-supports-015.xht support/pass.xht
+== css-supports-016.xht support/pass.xht
+== css-supports-017.xht support/pass.xht
+== css-supports-018.xht support/pass.xht
+== css-supports-019.xht support/pass.xht
+== css-supports-020.xht support/pass.xht
+== css-supports-021.xht support/pass.xht
+== css-supports-022.xht support/pass.xht
+== css-supports-023.xht support/pass.xht
+== css-supports-024.xht support/pass.xht
+== css-supports-025.xht support/pass.xht
+== css-supports-026.xht support/pass.xht
+== css-supports-027.xht support/pass.xht
+== css-supports-028.xht support/pass.xht
+== css-supports-029.xht support/pass.xht
+== css-supports-030.xht support/pass.xht
+== css-supports-031.xht support/pass.xht
diff --git a/layout/reftests/w3c-css/submitted/conditional3/support/pass.xht b/layout/reftests/w3c-css/submitted/conditional3/support/pass.xht
new file mode 100644
index 000000000000..24dc3107e8b0
--- /dev/null
+++ b/layout/reftests/w3c-css/submitted/conditional3/support/pass.xht
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au"/>
+  <style type="text/css"><![CDATA[
+   html { background-color: green }
+  ]]></style>
+ </head>
+ <body>
+ </body>
+</html>
