diff --git a/test-suite/tests/bytevectors.test b/test-suite/tests/bytevectors.test
index fe54b020c..35bdb4795 100644
--- a/test-suite/tests/bytevectors.test
+++ b/test-suite/tests/bytevectors.test
@@ -1,6 +1,6 @@
-;;;; bytevectors.test --- Exercise the R6RS bytevector API.
+;;;; bytevectors.test --- R6RS bytevectors. -*- mode: scheme; coding: iso-8859-1; -*-
 ;;;;
-;;;; Copyright (C) 2009 Free Software Foundation, Inc.
+;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ;;;; Ludovic Courtès
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
@@ -696,9 +696,3 @@
   (pass-if "bitvector > 8"
     (let ((bv (uniform-array->bytevector (make-bitvector 9 #t))))
       (= (bytevector-length bv) 2))))
-
-
-;;; Local Variables:
-;;; coding: latin-1
-;;; mode: scheme
-;;; End:
diff --git a/test-suite/tests/keywords.test b/test-suite/tests/keywords.test
index 78053ad4f..42bb379aa 100644
--- a/test-suite/tests/keywords.test
+++ b/test-suite/tests/keywords.test
@@ -1,6 +1,6 @@
-;;;; keywords.test --- Keywords                  -*- Scheme -*-
+;;;; keywords.test --- Keywords.           -*- mode: scheme; coding: utf-8; -*-
 ;;;;
-;;;; 	Copyright (C) 2009 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,3 @@
   (pass-if "printing"
     (string=? (with-output-to-string (lambda () (write #:this)))
 	      "#:this")))
-
-;;; Local Variables:
-;;; coding: latin-1
-;;; End:
diff --git a/test-suite/tests/procprop.test b/test-suite/tests/procprop.test
index 6af73f6bb..c009f88ce 100644
--- a/test-suite/tests/procprop.test
+++ b/test-suite/tests/procprop.test
@@ -1,7 +1,7 @@
-;;;; procprop.test --- Procedure properties               -*- Scheme -*-
-;;;; Ludovic Courtès <ludo@gnu.org>
+;;;; procprop.test --- Procedure properties -*- mode: scheme; coding: utf-8; -*-
+;;;; Ludovic Courtès <ludo@gnu.org>
 ;;;;
-;;;; 	Copyright (C) 2009 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -53,8 +53,3 @@
   (pass-if "list"
     (equal? (procedure-property list 'arity)
             '(0 0 #t))))
-
-
-;;; Local Variables:
-;;; coding: latin-1
-;;; End:
diff --git a/test-suite/tests/srfi-35.test b/test-suite/tests/srfi-35.test
index 849d1dea2..6d725dc15 100644
--- a/test-suite/tests/srfi-35.test
+++ b/test-suite/tests/srfi-35.test
@@ -1,7 +1,7 @@
-;;;; srfi-35.test --- Test suite for SRFI-35               -*- Scheme -*-
-;;;; Ludovic Courtès <ludo@gnu.org>
+;;;; srfi-35.test --- SRFI-35.             -*- mode: scheme; coding: utf-8; -*-
+;;;; Ludovic Courtès <ludo@gnu.org>
 ;;;;
-;;;; 	Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -316,8 +316,3 @@
 
   (pass-if "(c2-b v5)"
     (equal? (c2-b v5) "b2")))
-
-
-;;; Local Variables:
-;;; coding: latin-1
-;;; End:
diff --git a/test-suite/tests/srfi-88.test b/test-suite/tests/srfi-88.test
index b879941b2..07b9e43eb 100644
--- a/test-suite/tests/srfi-88.test
+++ b/test-suite/tests/srfi-88.test
@@ -1,7 +1,7 @@
-;;;; srfi-88.test --- Test suite for SRFI-88               -*- Scheme -*-
-;;;; Ludovic Courtès <ludo@gnu.org>
+;;;; srfi-88.test --- SRFI-88.             -*- mode: scheme; coding: utf-8; -*-
+;;;; Ludovic Courtès <ludo@gnu.org>
 ;;;;
-;;;; 	Copyright (C) 2008 Free Software Foundation, Inc.
+;;;; 	Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -51,8 +51,3 @@
     ;; `#{extended symbol}#:'.
     (string=? ""
               (keyword->string (string->keyword "")))))
-
-
-;;; Local Variables:
-;;; coding: latin-1
-;;; End: