diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py
index a4c5921ce1386960ccaaa578e9f87378ba690b6b..a453b7a29cd9e10794fd3b429ca4285ce73fd55b 100644
--- a/qa/qa_rapi.py
+++ b/qa/qa_rapi.py
@@ -1,4 +1,5 @@
 #
+#
 
 # Copyright (C) 2007, 2008, 2009, 2010, 2011 Google Inc.
 #
diff --git a/qa/qa_tags.py b/qa/qa_tags.py
index a4350aa3e9afd425488613e012f65c047144014a..5aa316dba2c670e26806eaf4e361c7462c439482 100644
--- a/qa/qa_tags.py
+++ b/qa/qa_tags.py
@@ -1,3 +1,6 @@
+#
+#
+
 # Copyright (C) 2007 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/test/ganeti.cmdlib_unittest.py b/test/ganeti.cmdlib_unittest.py
index cbec44b17f04349fc201f4c73e05a50c8487affd..6d06200e7942c08516dcd556636abb3f97a2b151 100755
--- a/test/ganeti.cmdlib_unittest.py
+++ b/test/ganeti.cmdlib_unittest.py
@@ -16,7 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the cmdlib module"""
diff --git a/test/ganeti.confd.client_unittest.py b/test/ganeti.confd.client_unittest.py
index d816d163a98808e62b7aa56da4220815813699f3..0afec601e5cacf59507f66c8ac9536b43a63a8d8 100755
--- a/test/ganeti.confd.client_unittest.py
+++ b/test/ganeti.confd.client_unittest.py
@@ -16,7 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the confd client module"""
diff --git a/test/ganeti.constants_unittest.py b/test/ganeti.constants_unittest.py
index 9aab10fa1db2c565e01a4e32cad6e95eb71366d7..70bd89758b5bde9233a249a093a07046c4e9ae85 100755
--- a/test/ganeti.constants_unittest.py
+++ b/test/ganeti.constants_unittest.py
@@ -16,7 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the constants module"""
diff --git a/test/ganeti.locking_unittest.py b/test/ganeti.locking_unittest.py
index fe19e47d749c54ebb0fc1a24f16c573adf884227..138e016b5f17c1885127242fd4a6b1cc6aaddeb5 100755
--- a/test/ganeti.locking_unittest.py
+++ b/test/ganeti.locking_unittest.py
@@ -16,7 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the locking module"""
diff --git a/test/ganeti.objects_unittest.py b/test/ganeti.objects_unittest.py
index 996a50db10d8dece96420efd3d0c2c28ad4e4cee..23f2e28b0ca57f20c75829913e5174b623f616cb 100755
--- a/test/ganeti.objects_unittest.py
+++ b/test/ganeti.objects_unittest.py
@@ -16,7 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the objects module"""
diff --git a/test/ganeti.serializer_unittest.py b/test/ganeti.serializer_unittest.py
index 9d8d6568096133b2b8d36f7f5a71c2132a264e16..a4f78371b83f5a766b340c42900ff6fa8300a427 100755
--- a/test/ganeti.serializer_unittest.py
+++ b/test/ganeti.serializer_unittest.py
@@ -16,7 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the serializer module"""
diff --git a/test/ganeti.uidpool_unittest.py b/test/ganeti.uidpool_unittest.py
index de4fbc906677139ed4f451b8402def0188484b6f..3dd45ed6bbf7f5d311fc7e8353e8cd7e91471a62 100755
--- a/test/ganeti.uidpool_unittest.py
+++ b/test/ganeti.uidpool_unittest.py
@@ -16,7 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 0.0510-1301, USA.
+# 02110-1301, USA.
 
 
 """Script for unittesting the uidpool module"""