diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index fd7020b23..bb96dca88 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 14025e2ee..a634e1e29 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 3eccd1ed3..23a406e75 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 9769e1b33..0c45845f3 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 148f936bf..1debdc460 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 34435702e..58b821359 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 152d55d22..b2b6df3f6 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 3d81a57d3..26d11021c 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 00c16330f..ebcc8de4b 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 a5bee937f..2cb5eebd4 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 d16a14fad..9106e74cc 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 79f1dea5e..a1b45fc2b 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 fda6ce1ff..565071fd9 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 ae932c721..d7f50afcd 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 b5f04e1a1..34b475f44 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 6ded6deaa..1dbdcb54b
--- 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 49f22f2ff..1580ef7e3 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 01de70145..c6233f148 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 3f858dc1e..0c84d2fd0 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 04dbb8c3e..4c9778d1b 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 79d8cc076..8652e8cba 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 360b058e3..c24676641 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 a5946324f..cbbf39d67 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 b12f50bdf..ba464a599 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 12f813d81..63df92341 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 cc3ca1114..16cf77dc8 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()