diff --git a/devtools/client/webconsole/test/browser/test-external-script-errors.html b/devtools/client/webconsole/test/browser/test-external-script-errors.html
index a4d2b87a17c3..1a0d7c62854b 100644
--- a/devtools/client/webconsole/test/browser/test-external-script-errors.html
+++ b/devtools/client/webconsole/test/browser/test-external-script-errors.html
@@ -3,14 +3,12 @@
Test for bug 597136: external script errors
diff --git a/js/src/ctypes/libffi/msvcc.sh b/js/src/ctypes/libffi/msvcc.sh
index 97facd6985d0..a1479c476f82 100755
--- a/js/src/ctypes/libffi/msvcc.sh
+++ b/js/src/ctypes/libffi/msvcc.sh
@@ -1,6 +1,5 @@
#!/bin/sh
-# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -35,8 +34,6 @@
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
-# ***** END LICENSE BLOCK *****
-
#
# GCC-compatible wrapper for cl.exe and ml.exe. Arguments are given in GCC
# format and translated into something sensible for cl or ml.
diff --git a/testing/talos/talos/pageloader/api.js b/testing/talos/talos/pageloader/api.js
index 7a88d0e62ce1..fd75fe3a893b 100644
--- a/testing/talos/talos/pageloader/api.js
+++ b/testing/talos/talos/pageloader/api.js
@@ -1,4 +1,4 @@
-/* ***** BEGIN LICENSE BLOCK *****
+/*
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
@@ -34,8 +34,7 @@
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ */
/* globals AppConstants, Services, XPCOMUtils */
diff --git a/testing/talos/talos/pageloader/chrome/pageloader.xhtml b/testing/talos/talos/pageloader/chrome/pageloader.xhtml
index 177502a57dd3..695622f08934 100644
--- a/testing/talos/talos/pageloader/chrome/pageloader.xhtml
+++ b/testing/talos/talos/pageloader/chrome/pageloader.xhtml
@@ -1,5 +1,5 @@
-
+ -->
diff --git a/testing/talos/talos/pageloader/chrome/quit.js b/testing/talos/talos/pageloader/chrome/quit.js
index 0261295c1cdd..9d1dce11808a 100644
--- a/testing/talos/talos/pageloader/chrome/quit.js
+++ b/testing/talos/talos/pageloader/chrome/quit.js
@@ -1,5 +1,5 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; -*- */
-/* ***** BEGIN LICENSE BLOCK *****
+/*
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
@@ -32,8 +32,7 @@
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ */
/*
From mozilla/toolkit/content
diff --git a/testing/talos/talos/tests/dromaeo/tests/dromaeo-string-base64.html b/testing/talos/talos/tests/dromaeo/tests/dromaeo-string-base64.html
index bb82256a1ffb..f4df5d230f56 100644
--- a/testing/talos/talos/tests/dromaeo/tests/dromaeo-string-base64.html
+++ b/testing/talos/talos/tests/dromaeo/tests/dromaeo-string-base64.html
@@ -2,7 +2,7 @@