diff --git a/t/pmc/arrayiterator.t b/t/pmc/arrayiterator.t
index 925e65a3d2..15e5bb5701 100644
--- a/t/pmc/arrayiterator.t
+++ b/t/pmc/arrayiterator.t
@@ -1,5 +1,5 @@
 #! parrot
-# Copyright (C) 2001-2009, Parrot Foundation.
+# Copyright (C) 2001-2010, Parrot Foundation.
 # $Id$
 
 =head1 NAME
@@ -132,10 +132,8 @@ CATCH:
 DONE:
 .end
 
-
 # Local Variables:
-#   mode: cperl
-#   cperl-indent-level: 4
+#   mode: pir
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4 ft=pir:
diff --git a/t/pmc/bigint.t b/t/pmc/bigint.t
index 8ac67f51c4..85ee58835f 100644
--- a/t/pmc/bigint.t
+++ b/t/pmc/bigint.t
@@ -987,7 +987,6 @@ NOK6:
 
 # Local Variables:
 #   mode: pir
-#   cperl-indent-level: 4
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4 filetype=pir:
+# vim: expandtab shiftwidth=4 ft=pir:
diff --git a/t/pmc/complex.t b/t/pmc/complex.t
index df5f9e5d90..11390fa8b9 100644
--- a/t/pmc/complex.t
+++ b/t/pmc/complex.t
@@ -1,5 +1,5 @@
 #! parrot
-# Copyright (C) 2001-2009, Parrot Foundation.
+# Copyright (C) 2001-2010, Parrot Foundation.
 # $Id$
 
 =head1 NAME
@@ -1178,8 +1178,7 @@ todo:
 
 
 # Local Variables:
-#   mode: cperl
-#   cperl-indent-level: 4
+#   mode: pir
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4 filetype=pir:
+# vim: expandtab shiftwidth=4 ft=pir:
diff --git a/t/pmc/continuation.t b/t/pmc/continuation.t
index aaf347e3e9..14d68bbe62 100644
--- a/t/pmc/continuation.t
+++ b/t/pmc/continuation.t
@@ -1,5 +1,5 @@
 #! parrot
-# Copyright (C) 2006-2007, Parrot Foundation.
+# Copyright (C) 2006-2010, Parrot Foundation.
 # $Id$
 
 =head1 NAME
@@ -45,7 +45,6 @@ end:
 
 # Local Variables:
 #   mode: pir
-#   cperl-indent-level: 4
 #   fill-column: 100
 # End:
 # vim: expandtab shiftwidth=4 ft=pir:
diff --git a/t/pmc/default.t b/t/pmc/default.t
index a487c3002b..8fe65e0600 100644
--- a/t/pmc/default.t
+++ b/t/pmc/default.t
@@ -1,5 +1,5 @@
 #!parrot
-# Copyright (C) 2006-2009, Parrot Foundation.
+# Copyright (C) 2006-2010, Parrot Foundation.
 # $Id$
 
 =head1 NAME
@@ -45,8 +45,7 @@ Tests the default PMC.
 .end
 
 # Local Variables:
-#   mode: cperl
-#   cperl-indent-level: 4
+#   mode: pir
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4 ft=pir:
diff --git a/t/pmc/env.t b/t/pmc/env.t
index f5b080aa2b..e70423132d 100644
--- a/t/pmc/env.t
+++ b/t/pmc/env.t
@@ -1,5 +1,5 @@
 #! parrot
-# Copyright (C) 2001-2008, Parrot Foundation.
+# Copyright (C) 2001-2010, Parrot Foundation.
 # $Id$
 
 =head1 NAME
@@ -184,7 +184,6 @@ end:
 
 # Local Variables:
 #   mode: pir
-#   cperl-indent-level: 4
 #   fill-column: 100
 # End:
 # vim: expandtab shiftwidth=4 ft=pir:
diff --git a/t/pmc/exception.t b/t/pmc/exception.t
index eaaed337c2..55d8c77475 100644
--- a/t/pmc/exception.t
+++ b/t/pmc/exception.t
@@ -1,5 +1,5 @@
 #! parrot
-# Copyright (C) 2009, Parrot Foundation.
+# Copyright (C) 2009,-2010 Parrot Foundation.
 # $Id$
 
 =head1 NAME
@@ -172,8 +172,7 @@ _handler:
 .end
 
 # Local Variables:
-#   mode: cperl
-#   cperl-indent-level: 4
+#   mode: pir
 #   fill-column: 100
 # End:
 # vim: expandtab shiftwidth=4 ft=pir: