diff --git a/layout/reftests/w3c-css/import-tests.py b/layout/reftests/w3c-css/import-tests.py
index 98dca3aa3e81..1ec06f16fd01 100755
--- a/layout/reftests/w3c-css/import-tests.py
+++ b/layout/reftests/w3c-css/import-tests.py
@@ -9,6 +9,7 @@ import xml.dom.minidom
 import html5lib
 import fnmatch
 import shutil
+import string
 import sys
 import re
 
@@ -158,7 +159,7 @@ def copy_support_files(test, dirname):
     if not os.path.exists(support_dir):
         return
     for dirpath, dirnames, filenames in os.walk(support_dir):
-        for srcname in filenames:
+        for srcname in sorted(filenames, key=string.lower):
             if srcname == "LOCK":
                 continue
             full_srcname = os.path.join(dirpath, srcname)
@@ -346,7 +347,13 @@ def main():
         add_test_items(t)
 
     listfile = open(os.path.join(gDestPath, "reftest.list"), "wb")
-    listfile.write("# THIS FILE IS AUTOGENERATED BY {0}\n# DO NOT EDIT!\n".format(os.path.basename(__file__)))
+    listfile.write(
+        """# THIS FILE IS AUTOGENERATED BY {0}
+# DO NOT EDIT!!!
+# To update the test expectations, please edit failures.list, and rerun
+# {0} locally on web platform tests repository against the
+# revision listed at the beginning of received/import.log.\n\n"""\
+        .format(os.path.basename(__file__)))
     lastDefaultPreferences = None
     for test in tests:
         defaultPreferences = gDefaultPreferences.get(test[1].split("/")[0], None)
diff --git a/layout/reftests/w3c-css/received/import.log b/layout/reftests/w3c-css/received/import.log
index 52b8ba2d58ee..58124ea6328c 100644
--- a/layout/reftests/w3c-css/received/import.log
+++ b/layout/reftests/w3c-css/received/import.log
@@ -1,5 +1,5 @@
 Importing revision: 15f199c91a72b0d51bf0a12b3b77827ecb5051ff
-from repository: https://github.com/neerjapancholi/web-platform-tests.git
+from repository: https://github.com/web-platform-tests/wpt.git
 Importing css-conditional/OWNERS to css-conditional/OWNERS
 Importing css-conditional/at-media-whitespace-optional-001.html to css-conditional/at-media-whitespace-optional-001.html
 Importing css-conditional/reference/background-lime.html to css-conditional/reference/background-lime.html
diff --git a/layout/reftests/w3c-css/received/reftest.list b/layout/reftests/w3c-css/received/reftest.list
index 36fff17f6c1d..2069bffb8047 100644
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -1,5 +1,9 @@
 # THIS FILE IS AUTOGENERATED BY import-tests.py
-# DO NOT EDIT!
+# DO NOT EDIT!!!
+# To update the test expectations, please edit failures.list, and rerun
+# import-tests.py locally on web platform tests repository against the
+# revision listed at the beginning of received/import.log.
+
 == css-conditional/at-media-whitespace-optional-001.html css-conditional/reference/background-lime.html
 == css-conditional/at-media-whitespace-optional-002.html css-conditional/reference/background-lime.html
 == css-conditional/at-supports-001.html css-conditional/at-supports-001-ref.html