Fix FSF copyright notices.

72 files changed, 72 insertions, 72 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 170526f8c8..7f8ad861d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/anonself.c b/tests/anonself.c
index 21bd6df147..44b81a9ae0 100644
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/certder.c b/tests/certder.c
index b39583404d..879caadbe5 100644
--- a/tests/certder.c
+++ b/tests/certder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2008 Free Software Foundation
+ * Copyright (C) 2006, 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/chainverify.c b/tests/chainverify.c
index 7dccea144e..6f3821439f 100644
--- a/tests/chainverify.c
+++ b/tests/chainverify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009 Free Software Foundation
+ * Copyright (C) 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/crq_apis.c b/tests/crq_apis.c
index 26ab321208..f748d6509b 100644
--- a/tests/crq_apis.c
+++ b/tests/crq_apis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009 Free Software Foundation
+ * Copyright (C) 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/crq_key_id.c b/tests/crq_key_id.c
index 7658874dbd..bc5319cbda 100644
--- a/tests/crq_key_id.c
+++ b/tests/crq_key_id.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009 Free Software Foundation
+ * Copyright (C) 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: David Marín Carreño
  *
diff --git a/tests/crypto_rng.c b/tests/crypto_rng.c
index 5fd8557daf..88548aee6c 100644
--- a/tests/crypto_rng.c
+++ b/tests/crypto_rng.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/tests/cve-2008-4989.c b/tests/cve-2008-4989.c
index 84413a46ca..fb852878e7 100644
--- a/tests/cve-2008-4989.c
+++ b/tests/cve-2008-4989.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009 Free Software Foundation
+ * Copyright (C) 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/cve-2009-1415.c b/tests/cve-2009-1415.c
index b74a5a29b4..fd304b6a39 100644
--- a/tests/cve-2009-1415.c
+++ b/tests/cve-2009-1415.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/cve-2009-1416.c b/tests/cve-2009-1416.c
index b637344949..69e68c20f7 100644
--- a/tests/cve-2009-1416.c
+++ b/tests/cve-2009-1416.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/dhepskself.c b/tests/dhepskself.c
index ce9f58e577..d3e89a979c 100644
--- a/tests/dhepskself.c
+++ b/tests/dhepskself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/dn.c b/tests/dn.c
index c47b04c8e6..765f0cea55 100644
--- a/tests/dn.c
+++ b/tests/dn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
  * Author: Simon Josefsson, Howard Chu
  *
  * This file is part of GNUTLS.
diff --git a/tests/dn2.c b/tests/dn2.c
index ebe189e49e..f5a7e92151 100644
--- a/tests/dn2.c
+++ b/tests/dn2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  * Author: Simon Josefsson
  *
  * This file is part of GNUTLS.
diff --git a/tests/finished.c b/tests/finished.c
index 8567d470f2..10e67c9972 100644
--- a/tests/finished.c
+++ b/tests/finished.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/gc.c b/tests/gc.c
index 70c6180525..776f6c174c 100644
--- a/tests/gc.c
+++ b/tests/gc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * This file is part of GNUTLS.
  *
diff --git a/tests/hostname-check.c b/tests/hostname-check.c
index 22ce874f00..f5ce4cc829 100644
--- a/tests/hostname-check.c
+++ b/tests/hostname-check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2009 Free Software Foundation
+ * Copyright (C) 2007, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/init_roundtrip.c b/tests/init_roundtrip.c
index 13dbc3e1c6..589c80752d 100644
--- a/tests/init_roundtrip.c
+++ b/tests/init_roundtrip.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/key-id/Makefile.am b/tests/key-id/Makefile.am
index 6240a3baa3..75f1cb20c6 100644
--- a/tests/key-id/Makefile.am
+++ b/tests/key-id/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007, 2008 Free Software Foundation
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/key-id/key-id b/tests/key-id/key-id
index be53bd3904..3fbffacee2 100755
--- a/tests/key-id/key-id
+++ b/tests/key-id/key-id
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c
index 9cc3c5a301..4a7c071d47 100644
--- a/tests/mini-eagain.c
+++ b/tests/mini-eagain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson, Nikos Mavrogiannopoulos
  *
diff --git a/tests/mini.c b/tests/mini.c
index e1da277632..c9198ad036 100644
--- a/tests/mini.c
+++ b/tests/mini.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/moredn.c b/tests/moredn.c
index ed7935d0b2..d0b6ca712f 100644
--- a/tests/moredn.c
+++ b/tests/moredn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Joe Orton
  *
diff --git a/tests/mpi.c b/tests/mpi.c
index e37f273dd3..f4e7343e85 100644
--- a/tests/mpi.c
+++ b/tests/mpi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2009 Free Software Foundation
+ * Copyright (C) 2007, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/netconf-psk.c b/tests/netconf-psk.c
index ca6459de4e..fe86cd034d 100644
--- a/tests/netconf-psk.c
+++ b/tests/netconf-psk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/nist-pkits/pkits b/tests/nist-pkits/pkits
index 641b093bd4..86b3095f8b 100755
--- a/tests/nist-pkits/pkits
+++ b/tests/nist-pkits/pkits
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2007 Free Software Foundation
+# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/tests/nist-pkits/pkits_crl b/tests/nist-pkits/pkits_crl
index 30466ee56d..00d4bab774 100755
--- a/tests/nist-pkits/pkits_crl
+++ b/tests/nist-pkits/pkits_crl
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2007 Free Software Foundation
+# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/tests/nist-pkits/pkits_crt b/tests/nist-pkits/pkits_crt
index 8e9daa55e1..3de9771789 100755
--- a/tests/nist-pkits/pkits_crt
+++ b/tests/nist-pkits/pkits_crt
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2007 Free Software Foundation
+# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/tests/nist-pkits/pkits_pkcs12 b/tests/nist-pkits/pkits_pkcs12
index 93a1d81d40..f330c81125 100755
--- a/tests/nist-pkits/pkits_pkcs12
+++ b/tests/nist-pkits/pkits_pkcs12
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2007 Free Software Foundation
+# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/tests/nist-pkits/pkits_smime b/tests/nist-pkits/pkits_smime
index 3d494af7c0..d950334f40 100755
--- a/tests/nist-pkits/pkits_smime
+++ b/tests/nist-pkits/pkits_smime
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2007 Free Software Foundation
+# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/tests/nul-in-x509-names.c b/tests/nul-in-x509-names.c
index 0ad9626a5e..0ba85f89f1 100644
--- a/tests/nul-in-x509-names.c
+++ b/tests/nul-in-x509-names.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/openpgp-certs/Makefile.am b/tests/openpgp-certs/Makefile.am
index 76fbf3a82b..7e9ae7ce44 100644
--- a/tests/openpgp-certs/Makefile.am
+++ b/tests/openpgp-certs/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007, 2008 Free Software Foundation
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/tests/openpgp-certs/testcerts b/tests/openpgp-certs/testcerts
index 3d6f1f5d02..3caf19e3ae 100755
--- a/tests/openpgp-certs/testcerts
+++ b/tests/openpgp-certs/testcerts
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2010 Free Software Foundation
+# Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/tests/openpgp-certs/testselfsigs b/tests/openpgp-certs/testselfsigs
index ace43f5780..a1084fcae8 100755
--- a/tests/openpgp-certs/testselfsigs
+++ b/tests/openpgp-certs/testselfsigs
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2010 Free Software Foundation
+# Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/tests/openpgp-keyring.c b/tests/openpgp-keyring.c
index 8b5e259e4f..3fdf788d99 100644
--- a/tests/openpgp-keyring.c
+++ b/tests/openpgp-keyring.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Free Software Foundation
+ * Copyright (C) 2007 Free Software Foundation, Inc.
  * Author: Ludovic Courtès, Timo Schulz
  *
  * This file is part of GNUTLS.
diff --git a/tests/openpgpself.c b/tests/openpgpself.c
index 958388ac6d..459ff435a2 100644
--- a/tests/openpgpself.c
+++ b/tests/openpgpself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/openssl.c b/tests/openssl.c
index 5360acd1d9..c534fbeac1 100644
--- a/tests/openssl.c
+++ b/tests/openssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/oprfi.c b/tests/oprfi.c
index 8f128ef6fd..51502acff5 100644
--- a/tests/oprfi.c
+++ b/tests/oprfi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/parse_ca.c b/tests/parse_ca.c
index 1b973e2b7c..6a699ddecd 100644
--- a/tests/parse_ca.c
+++ b/tests/parse_ca.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Free Software Foundation
+ * Copyright (C) 2007 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/pathlen/Makefile.am b/tests/pathlen/Makefile.am
index 6d870f71d2..f5b6b9e3e4 100644
--- a/tests/pathlen/Makefile.am
+++ b/tests/pathlen/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007, 2008 Free Software Foundation
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pathlen/pathlen b/tests/pathlen/pathlen
index 1835698978..ddda90baa2 100755
--- a/tests/pathlen/pathlen
+++ b/tests/pathlen/pathlen
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pkcs1-padding/Makefile.am b/tests/pkcs1-padding/Makefile.am
index 9cacfdbf8a..d185415be5 100644
--- a/tests/pkcs1-padding/Makefile.am
+++ b/tests/pkcs1-padding/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006, 2008 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pkcs1-padding/pkcs1-pad b/tests/pkcs1-padding/pkcs1-pad
index c5827a8cd3..f43f2598e8 100755
--- a/tests/pkcs1-padding/pkcs1-pad
+++ b/tests/pkcs1-padding/pkcs1-pad
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2006, 2008, 2009 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pkcs12-decode/Makefile.am b/tests/pkcs12-decode/Makefile.am
index aaea92a125..6f46a61fcb 100644
--- a/tests/pkcs12-decode/Makefile.am
+++ b/tests/pkcs12-decode/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006, 2008 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pkcs12-decode/pkcs12 b/tests/pkcs12-decode/pkcs12
index d2634a8c45..1ae32b199c 100755
--- a/tests/pkcs12-decode/pkcs12
+++ b/tests/pkcs12-decode/pkcs12
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pkcs12_encode.c b/tests/pkcs12_encode.c
index 28e24aaf27..55853c601e 100644
--- a/tests/pkcs12_encode.c
+++ b/tests/pkcs12_encode.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/pkcs12_s2k.c b/tests/pkcs12_s2k.c
index e8b6dfcb29..cbc1459a99 100644
--- a/tests/pkcs12_s2k.c
+++ b/tests/pkcs12_s2k.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/pkcs12_s2k_pem.c b/tests/pkcs12_s2k_pem.c
index 9db3842162..9a44e0d5c1 100644
--- a/tests/pkcs12_s2k_pem.c
+++ b/tests/pkcs12_s2k_pem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/pkcs8-decode/Makefile.am b/tests/pkcs8-decode/Makefile.am
index 4f29e5d259..41eadb1f7e 100644
--- a/tests/pkcs8-decode/Makefile.am
+++ b/tests/pkcs8-decode/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006 Free Software Foundation
+# Copyright (C) 2006 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pkcs8-decode/pkcs8 b/tests/pkcs8-decode/pkcs8
index 60906d13ad..8af5f2d8d1 100755
--- a/tests/pkcs8-decode/pkcs8
+++ b/tests/pkcs8-decode/pkcs8
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/pskself.c b/tests/pskself.c
index 6c74763c2b..1a854cd845 100644
--- a/tests/pskself.c
+++ b/tests/pskself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/resume.c b/tests/resume.c
index cf26669be0..a6355c9ecc 100644
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/rfc2253-escape-test b/tests/rfc2253-escape-test
index 5dde6c824f..60e82eed11 100755
--- a/tests/rfc2253-escape-test
+++ b/tests/rfc2253-escape-test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2009 Free Software Foundation
+# Copyright (C) 2009 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/rsa-md5-collision/Makefile.am b/tests/rsa-md5-collision/Makefile.am
index 785efa799c..6cfffd9082 100644
--- a/tests/rsa-md5-collision/Makefile.am
+++ b/tests/rsa-md5-collision/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006, 2008 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/rsa-md5-collision/rsa-md5-collision b/tests/rsa-md5-collision/rsa-md5-collision
index af5b1b080e..7472b149fb 100755
--- a/tests/rsa-md5-collision/rsa-md5-collision
+++ b/tests/rsa-md5-collision/rsa-md5-collision
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2006, 2008 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/safe-renegotiation/Makefile.am b/tests/safe-renegotiation/Makefile.am
index 651c7e6d2a..4a85cfeb01 100644
--- a/tests/safe-renegotiation/Makefile.am
+++ b/tests/safe-renegotiation/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2010 Free Software Foundation
+# Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/tests/safe-renegotiation/testsrn b/tests/safe-renegotiation/testsrn
index 867d45a8c1..877f451758 100755
--- a/tests/safe-renegotiation/testsrn
+++ b/tests/safe-renegotiation/testsrn
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2010 Free Software Foundation
+# Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/tests/set_pkcs12_cred.c b/tests/set_pkcs12_cred.c
index ebdf8b111e..f520e40a7c 100644
--- a/tests/set_pkcs12_cred.c
+++ b/tests/set_pkcs12_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2006, 2008 Free Software Foundation
+ * Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/setcredcrash.c b/tests/setcredcrash.c
index 0a55ae3b94..3e116b3c95 100644
--- a/tests/setcredcrash.c
+++ b/tests/setcredcrash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/sha2/Makefile.am b/tests/sha2/Makefile.am
index cdfa994d75..0265be863b 100644
--- a/tests/sha2/Makefile.am
+++ b/tests/sha2/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007, 2008 Free Software Foundation
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/sha2/sha2 b/tests/sha2/sha2
index 49f951e009..19a3a1df9a 100755
--- a/tests/sha2/sha2
+++ b/tests/sha2/sha2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/simple.c b/tests/simple.c
index a3774e5d6e..88b22fd1ce 100644
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/tlsia.c b/tests/tlsia.c
index b2f684154a..a247cee68b 100644
--- a/tests/tlsia.c
+++ b/tests/tlsia.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/userid/Makefile.am b/tests/userid/Makefile.am
index c21afa8d6b..e43058aa3f 100644
--- a/tests/userid/Makefile.am
+++ b/tests/userid/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2006, 2008 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/userid/userid b/tests/userid/userid
index 76315649ac..2dd4bfe81b 100755
--- a/tests/userid/userid
+++ b/tests/userid/userid
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2006, 2008 Free Software Foundation
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/utils.c b/tests/utils.c
index b0c2845ee6..50f623f40e 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/utils.h b/tests/utils.h
index cb3c57b6ee..326e3b27da 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/x509_altname.c b/tests/x509_altname.c
index c9f00dc623..f104525e81 100644
--- a/tests/x509_altname.c
+++ b/tests/x509_altname.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
  * Author: Simon Josefsson, Howard Chu
  *
  * This file is part of GNUTLS.
diff --git a/tests/x509dn.c b/tests/x509dn.c
index f64f68f9fe..02923c6e52 100644
--- a/tests/x509dn.c
+++ b/tests/x509dn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/x509paths/chain b/tests/x509paths/chain
index 522fceeb71..a0e34d0452 100755
--- a/tests/x509paths/chain
+++ b/tests/x509paths/chain
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation
+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/tests/x509self.c b/tests/x509self.c
index fa2dbe86c9..8b334bce9a 100644
--- a/tests/x509self.c
+++ b/tests/x509self.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c
index c844c35429..4dc64100ee 100644
--- a/tests/x509sign-verify.c
+++ b/tests/x509sign-verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos, Simon Josefsson
  *
diff --git a/tests/x509signself.c b/tests/x509signself.c
index 6f7c1a2332..ebcad59d8f 100644
--- a/tests/x509signself.c
+++ b/tests/x509signself.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *