diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index fd7020b23eefc658955176472983cfb8e496a98e..bb96dca8803724017f308c138161b788485a6c26 100755
--- a/tests/qemu-iotests/001
+++ b/tests/qemu-iotests/001
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index 14025e2ee8f0f0d89963a79d5615fdd241afc675..a634e1e2902ab8d84b50e6b69784e0c7f9cb2987 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index 3eccd1ed35c439e80c4c5b830f9e39c6bf73efc9..23a406e75852192e6668326651c111c8753d5f63 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index 9769e1b33e14fe9522d88e38f84caf1cbde802b7..0c45845f3437a6eeab06fbad5b593abc01feef4b 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 148f936bf3ae8269de3ad017e6afea998f5779c4..1debdc4606bb1b76653f5c8730d43cce12c88b38 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -18,9 +18,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/006 b/tests/qemu-iotests/006
index 34435702e91339e92b4617386461148cfee4cd03..58b821359dd642a332ae20d88d833bbc3f6788d0 100755
--- a/tests/qemu-iotests/006
+++ b/tests/qemu-iotests/006
@@ -16,9 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 152d55d2210c4f7889fda3b75cb97c1027efe9d8..b2b6df3f65f3d694b40041cc41eea15bb187218d 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
index 3d81a57d3ad1a6e3ccfad908385db1fcae3e6d0a..26d11021ce2a70192e3c9f84c0cc837caf172a63 100755
--- a/tests/qemu-iotests/008
+++ b/tests/qemu-iotests/008
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index 00c16330fdbec18897e789f991ef280f44281dde..ebcc8de4b49e14c76ae2a57bdb8450d7c05463f4 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index a5bee937f956191de2ce8a304df4b6eb8c632973..2cb5eebd457d4c0c74e56010981c116aa7df63a9 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index d16a14fada493f44d7ee6dbab76e21bc29c6e1a2..9106e74cc47a577d078a6fe68c8b691f85b5553a 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
index 79f1dea5e5e49335c5f30658250bbac91a19995e..a1b45fc2b95f9acefa54ea624d495c5735e97060 100755
--- a/tests/qemu-iotests/012
+++ b/tests/qemu-iotests/012
@@ -17,9 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
index fda6ce1ffc413a94248c06d788d3f5f751720280..565071fd91f0203a94a6ca67b8e874a537e2f446 100755
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index ae932c7216cef9bbffde525173579e05da36edc6..d7f50afcd53745f86a90bbbe29c5be671d503177 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -16,9 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index b5f04e1a132c153ddc2b9ee5a2daee5dfa218f18..34b475f44e4bd19a8f4e4e13882df0cb8b885d4e 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/016 b/tests/qemu-iotests/016
old mode 100644
new mode 100755
index 6ded6deaada59efeeaf76413fc8f977f64828dad..1dbdcb54bcb6c57d31e15a57a4d1b78533ca587c
--- a/tests/qemu-iotests/016
+++ b/tests/qemu-iotests/016
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 49f22f2ff4571fed5c161290014c3526643597ea..1580ef7e3076995f5d5f04ebd89800b358391e0f 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index 01de701450d059ad12999549edb6635c97046d64..c6233f148dcca829ee112f6b6531a59496517419 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index 3f858dc1ef425026f88e8abde4e222f1a4655305..0c84d2fd0870b249a4b06d8d3270a95bd96ee65d 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -17,9 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 04dbb8c3ead6335bd0b7ffcd77e0928be104ca5a..4c9778d1bdd77f64395f6bbb8cf86319a2ef7a01 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 79d8cc076a80ba340573e835dc92aec93f891d02..8652e8cbafaadada273e9d7d57cd529116926e7c 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # Control script for QA
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index 360b058e35baafef89b2f48e6a6e51993722a755..c2467664108058da27e2af0f66b741526c673531 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # common procedures for QA scripts
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index a5946324ff28cabae89fc7087a15b37cd7fbba16..cbbf39d6789e86db12de32fb87e278792a871a3e 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # setup and check for config parameters, and in particular
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index b12f50bdf5277554c3dc43e01a976970e2da9b37..ba464a599058ae4f945bbf9d21e73b5bcd800f50 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # standard filters
diff --git a/tests/qemu-iotests/common.pattern b/tests/qemu-iotests/common.pattern
index 12f813d817315afc23cdc311749f94d9be1f7bff..63df923412275e98d327d2e1f58188e53142dab0 100644
--- a/tests/qemu-iotests/common.pattern
+++ b/tests/qemu-iotests/common.pattern
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 function do_is_allocated() {
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index cc3ca1114f485e07d215eceb4b081ebb2d3f0873..16cf77dc8c813659b5fffbe6d336947f76a39985 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -14,9 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 dd()