diff --git a/test/abbreviation.t b/test/abbreviation.t
index 937271b6b..f9ac67cb8 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -91,4 +91,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/add.t b/test/add.t
index 8cb3a65b7..bb223170e 100755
--- a/test/add.t
+++ b/test/add.t
@@ -127,4 +127,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/alias.t b/test/alias.t
index 4d38640f3..ebe941b97 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -161,4 +161,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/annotate.t b/test/annotate.t
index a87c42f86..26ee57018 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -182,4 +182,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/append.t b/test/append.t
index d1d16cd6c..16676f2f4 100755
--- a/test/append.t
+++ b/test/append.t
@@ -92,4 +92,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/args.1.t b/test/args.1.t
index e65a882cb..d45ec0f7f 100755
--- a/test/args.1.t
+++ b/test/args.1.t
@@ -64,4 +64,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/args.t b/test/args.t
index 062e5bf77..d6f9789ea 100755
--- a/test/args.t
+++ b/test/args.t
@@ -72,4 +72,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bash_completion.t b/test/bash_completion.t
index 45a18dfb0..fc8e2133e 100755
--- a/test/bash_completion.t
+++ b/test/bash_completion.t
@@ -171,4 +171,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.1006.t b/test/bug.1006.t
index a00a6d022..f6dad4659 100755
--- a/test/bug.1006.t
+++ b/test/bug.1006.t
@@ -84,4 +84,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.1031.t b/test/bug.1031.t
index ca049acf6..fcc7c1902 100755
--- a/test/bug.1031.t
+++ b/test/bug.1031.t
@@ -72,4 +72,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.1036.t b/test/bug.1036.t
index bf760e2bc..26dc19b86 100755
--- a/test/bug.1036.t
+++ b/test/bug.1036.t
@@ -64,4 +64,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.1063.t b/test/bug.1063.t
index 199f27c4e..fdb76e359 100755
--- a/test/bug.1063.t
+++ b/test/bug.1063.t
@@ -71,4 +71,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.1254.t b/test/bug.1254.t
index b81535e93..af0ff6c8c 100755
--- a/test/bug.1254.t
+++ b/test/bug.1254.t
@@ -68,4 +68,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.1267.t b/test/bug.1267.t
index eaeb324f3..005b82f6b 100755
--- a/test/bug.1267.t
+++ b/test/bug.1267.t
@@ -68,4 +68,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.360.t b/test/bug.360.t
index 8ba341c3c..450a05fc5 100755
--- a/test/bug.360.t
+++ b/test/bug.360.t
@@ -118,4 +118,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.425.t b/test/bug.425.t
index aeb66b592..327fbd915 100755
--- a/test/bug.425.t
+++ b/test/bug.425.t
@@ -52,4 +52,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.441.t b/test/bug.441.t
index e4ab87da0..10f9ceddd 100755
--- a/test/bug.441.t
+++ b/test/bug.441.t
@@ -53,4 +53,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.628.t b/test/bug.628.t
index eebfe3d82..30fb1ec73 100755
--- a/test/bug.628.t
+++ b/test/bug.628.t
@@ -53,4 +53,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.649.t b/test/bug.649.t
index fdcd2098e..49c3fb628 100755
--- a/test/bug.649.t
+++ b/test/bug.649.t
@@ -52,4 +52,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.656.t b/test/bug.656.t
index 60bc292b1..4d6a98cdb 100755
--- a/test/bug.656.t
+++ b/test/bug.656.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.674.t b/test/bug.674.t
index 6e4035fda..fc52dc74f 100755
--- a/test/bug.674.t
+++ b/test/bug.674.t
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.697.t b/test/bug.697.t
index 42aa3ed40..514c23aca 100755
--- a/test/bug.697.t
+++ b/test/bug.697.t
@@ -75,4 +75,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.818.t b/test/bug.818.t
index 6b825e5be..19159e52d 100755
--- a/test/bug.818.t
+++ b/test/bug.818.t
@@ -66,4 +66,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.835.t b/test/bug.835.t
index e5a6a0d5a..39e4c2cda 100755
--- a/test/bug.835.t
+++ b/test/bug.835.t
@@ -55,4 +55,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.837.t b/test/bug.837.t
index ffc069c22..1ecc323c0 100755
--- a/test/bug.837.t
+++ b/test/bug.837.t
@@ -68,4 +68,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.839.t b/test/bug.839.t
index 4c9d039bd..d50373d2b 100755
--- a/test/bug.839.t
+++ b/test/bug.839.t
@@ -54,4 +54,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.851.t b/test/bug.851.t
index 5717d6734..cbb697bce 100755
--- a/test/bug.851.t
+++ b/test/bug.851.t
@@ -63,4 +63,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.879.t b/test/bug.879.t
index bb3dd9086..a54535d16 100755
--- a/test/bug.879.t
+++ b/test/bug.879.t
@@ -56,4 +56,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.886.t b/test/bug.886.t
index 4d805d592..920954f31 100755
--- a/test/bug.886.t
+++ b/test/bug.886.t
@@ -57,4 +57,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.899.t b/test/bug.899.t
index e0208feda..bfa919da9 100755
--- a/test/bug.899.t
+++ b/test/bug.899.t
@@ -60,4 +60,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.954.t b/test/bug.954.t
index 0dc995524..d278e7512 100755
--- a/test/bug.954.t
+++ b/test/bug.954.t
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.956.t b/test/bug.956.t
index 447a2a627..52a181b02 100755
--- a/test/bug.956.t
+++ b/test/bug.956.t
@@ -74,4 +74,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.986.t b/test/bug.986.t
index b99064a98..7d7e22538 100755
--- a/test/bug.986.t
+++ b/test/bug.986.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.annotate.t b/test/bug.annotate.t
index 96fb6cd47..7a3a1baaa 100755
--- a/test/bug.annotate.t
+++ b/test/bug.annotate.t
@@ -71,4 +71,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.annual.t b/test/bug.annual.t
index f592cf845..addda9cfd 100755
--- a/test/bug.annual.t
+++ b/test/bug.annual.t
@@ -89,4 +89,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.before.t b/test/bug.before.t
index 35335fa35..3954a5eda 100755
--- a/test/bug.before.t
+++ b/test/bug.before.t
@@ -92,4 +92,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.bulk.t b/test/bug.bulk.t
index 81b4c4e27..94e75b432 100755
--- a/test/bug.bulk.t
+++ b/test/bug.bulk.t
@@ -78,4 +78,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.c001.t b/test/bug.c001.t
index 932a61146..2dc203fe3 100755
--- a/test/bug.c001.t
+++ b/test/bug.c001.t
@@ -53,4 +53,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.hasnt.t b/test/bug.hasnt.t
index d898429d2..0fde58d09 100755
--- a/test/bug.hasnt.t
+++ b/test/bug.hasnt.t
@@ -81,4 +81,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.period.t b/test/bug.period.t
index 3cdd111e3..e40d8cc85 100755
--- a/test/bug.period.t
+++ b/test/bug.period.t
@@ -129,4 +129,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.range.t b/test/bug.range.t
index ec70cf4ed..348346d5c 100755
--- a/test/bug.range.t
+++ b/test/bug.range.t
@@ -57,4 +57,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bug.summary.t b/test/bug.summary.t
index fffc3ce4e..2cbfd5887 100755
--- a/test/bug.summary.t
+++ b/test/bug.summary.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/bulk.t b/test/bulk.t
index 3a0a41511..64c298a26 100755
--- a/test/bulk.t
+++ b/test/bulk.t
@@ -172,4 +172,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/burndown.t b/test/burndown.t
index a826819d8..70cf24cf1 100755
--- a/test/burndown.t
+++ b/test/burndown.t
@@ -88,4 +88,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/calc.t b/test/calc.t
index 9898d3a63..b7d186c32 100755
--- a/test/calc.t
+++ b/test/calc.t
@@ -109,4 +109,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/calendar.t b/test/calendar.t
index c382ad2a4..6ef695a2e 100755
--- a/test/calendar.t
+++ b/test/calendar.t
@@ -192,4 +192,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/caseless.t b/test/caseless.t
index 73dc35838..6c5eddbc0 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -120,4 +120,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/cli.t b/test/cli.t
index ed8ebbf74..9e4a93b10 100755
--- a/test/cli.t
+++ b/test/cli.t
@@ -57,4 +57,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/color.cmd.t b/test/color.cmd.t
index 23e91a21b..c4e79fc19 100755
--- a/test/color.cmd.t
+++ b/test/color.cmd.t
@@ -84,4 +84,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/color.rules.t b/test/color.rules.t
index 1c9a54c22..cbc315eae 100755
--- a/test/color.rules.t
+++ b/test/color.rules.t
@@ -251,4 +251,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/columns.t b/test/columns.t
index ede57e498..b436906da 100755
--- a/test/columns.t
+++ b/test/columns.t
@@ -449,4 +449,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/completed.t b/test/completed.t
index f3fe5489e..3ba734308 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/completion.t b/test/completion.t
index 69b1392b8..f3c4ab914 100755
--- a/test/completion.t
+++ b/test/completion.t
@@ -84,4 +84,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/configuration.t b/test/configuration.t
index 9c3febb82..cd15ee39b 100755
--- a/test/configuration.t
+++ b/test/configuration.t
@@ -77,4 +77,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/confirmation.t b/test/confirmation.t
index 23e4bf0fe..96cf6e9c8 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -81,4 +81,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/context.t b/test/context.t
index 0bc36cbb3..ac96115b6 100755
--- a/test/context.t
+++ b/test/context.t
@@ -490,4 +490,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4 syntax=python
+# vim: ai sts=4 et sw=4 ft=python syntax=python
diff --git a/test/count.t b/test/count.t
index 5f055c2cb..77c07986e 100755
--- a/test/count.t
+++ b/test/count.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/countdown.t b/test/countdown.t
index a828aa5e9..6409d80c3 100755
--- a/test/countdown.t
+++ b/test/countdown.t
@@ -112,4 +112,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/custom.config.t b/test/custom.config.t
index 61e597e98..ad5ce0729 100755
--- a/test/custom.config.t
+++ b/test/custom.config.t
@@ -92,4 +92,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index b7278d1e7..823764638 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -64,4 +64,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/custom.t b/test/custom.t
index 6ae6e308b..adab52752 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -71,4 +71,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index 2adad2385..88cd750c4 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -64,4 +64,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/date.iso.t b/test/date.iso.t
index 0dc1883c7..fbbb39e18 100755
--- a/test/date.iso.t
+++ b/test/date.iso.t
@@ -63,4 +63,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/dateformat.t b/test/dateformat.t
index edf9c6496..be9640ab3 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -61,4 +61,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/datesort.t b/test/datesort.t
index ba09e6458..347e7466c 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -68,4 +68,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/datetime-negative.t b/test/datetime-negative.t
index 946a09e31..6a51618fe 100755
--- a/test/datetime-negative.t
+++ b/test/datetime-negative.t
@@ -429,4 +429,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/debug.t b/test/debug.t
index 6fa92917e..8d5c2030b 100755
--- a/test/debug.t
+++ b/test/debug.t
@@ -78,4 +78,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/default.command.t b/test/default.command.t
index 1ae8417db..93944b127 100755
--- a/test/default.command.t
+++ b/test/default.command.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/default.t b/test/default.t
index 31c5cfb01..ac4e74707 100755
--- a/test/default.t
+++ b/test/default.t
@@ -88,4 +88,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/delete.t b/test/delete.t
index a6415e347..71070d509 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -144,4 +144,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/denotate.t b/test/denotate.t
index b43d76681..13e39696f 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -94,4 +94,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/dependencies.t b/test/dependencies.t
index eb85b3f13..214526a93 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -207,4 +207,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/diag.t b/test/diag.t
index 4def1e86e..94af039a8 100755
--- a/test/diag.t
+++ b/test/diag.t
@@ -56,4 +56,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/diag_color.t b/test/diag_color.t
index 8d8e3e9da..5beab502d 100755
--- a/test/diag_color.t
+++ b/test/diag_color.t
@@ -72,4 +72,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/dom.t b/test/dom.t
index 3f93054b7..820a8817e 100755
--- a/test/dom.t
+++ b/test/dom.t
@@ -205,4 +205,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/due.t b/test/due.t
index c66e69597..75956595b 100755
--- a/test/due.t
+++ b/test/due.t
@@ -122,4 +122,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/duplicate.t b/test/duplicate.t
index 0cfd19121..3aa51f7b6 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -108,4 +108,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/edit.t b/test/edit.t
index f2523c454..6ecfaac86 100755
--- a/test/edit.t
+++ b/test/edit.t
@@ -93,4 +93,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/encoding.t b/test/encoding.t
index ed3ffaf22..1337c9f31 100755
--- a/test/encoding.t
+++ b/test/encoding.t
@@ -80,4 +80,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/enpassant.t b/test/enpassant.t
index 642da37ca..bd75425d4 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -141,4 +141,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/export.t b/test/export.t
index ad153c089..da3c44e53 100755
--- a/test/export.t
+++ b/test/export.t
@@ -212,4 +212,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.1013.t b/test/feature.1013.t
index 32b46dc5c..65333593a 100755
--- a/test/feature.1013.t
+++ b/test/feature.1013.t
@@ -72,4 +72,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.1061.t b/test/feature.1061.t
index 23e5eb0a3..b697040cd 100755
--- a/test/feature.1061.t
+++ b/test/feature.1061.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.559.t b/test/feature.559.t
index d64405aea..19322e767 100755
--- a/test/feature.559.t
+++ b/test/feature.559.t
@@ -75,4 +75,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.608.t b/test/feature.608.t
index e002a8d4a..6a800261b 100755
--- a/test/feature.608.t
+++ b/test/feature.608.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.725.t b/test/feature.725.t
index 832ae1e34..613b28c6d 100755
--- a/test/feature.725.t
+++ b/test/feature.725.t
@@ -66,4 +66,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.891.t b/test/feature.891.t
index f1c34e3b6..a200d9d5a 100755
--- a/test/feature.891.t
+++ b/test/feature.891.t
@@ -66,4 +66,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.default.project.t b/test/feature.default.project.t
index 9c75af781..75c6e818a 100755
--- a/test/feature.default.project.t
+++ b/test/feature.default.project.t
@@ -275,4 +275,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.print.empty.columns.t b/test/feature.print.empty.columns.t
index 5b0449df5..6c190397d 100755
--- a/test/feature.print.empty.columns.t
+++ b/test/feature.print.empty.columns.t
@@ -67,4 +67,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/feature.recurrence.t b/test/feature.recurrence.t
index 4a802dfd9..7eab88bd7 100755
--- a/test/feature.recurrence.t
+++ b/test/feature.recurrence.t
@@ -70,4 +70,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/filter.t b/test/filter.t
index a033716c3..56adcfa4e 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -706,4 +706,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/fontunderline.t b/test/fontunderline.t
index 3bc01be03..d31fb3218 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -89,4 +89,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/gc.t b/test/gc.t
index 740657216..ce195d6e5 100755
--- a/test/gc.t
+++ b/test/gc.t
@@ -75,4 +75,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/helpers.t b/test/helpers.t
index d07e56285..4ea011a33 100755
--- a/test/helpers.t
+++ b/test/helpers.t
@@ -53,4 +53,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/history.t b/test/history.t
index 46e6626c2..ec169e548 100755
--- a/test/history.t
+++ b/test/history.t
@@ -103,4 +103,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/hooks.env.t b/test/hooks.env.t
index 47d0b38ae..3eba83b2f 100755
--- a/test/hooks.env.t
+++ b/test/hooks.env.t
@@ -67,4 +67,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/hooks.on-add.t b/test/hooks.on-add.t
index b855c5ef6..96cda553e 100755
--- a/test/hooks.on-add.t
+++ b/test/hooks.on-add.t
@@ -160,4 +160,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/hooks.on-exit.t b/test/hooks.on-exit.t
index bd7963efc..8a5ae880d 100755
--- a/test/hooks.on-exit.t
+++ b/test/hooks.on-exit.t
@@ -108,4 +108,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/hooks.on-launch.t b/test/hooks.on-launch.t
index 0468d58af..7ca7e60dd 100755
--- a/test/hooks.on-launch.t
+++ b/test/hooks.on-launch.t
@@ -108,4 +108,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/hooks.on-modify.t b/test/hooks.on-modify.t
index c4a52801d..c56b98d06 100755
--- a/test/hooks.on-modify.t
+++ b/test/hooks.on-modify.t
@@ -177,4 +177,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/hyphenate.t b/test/hyphenate.t
index de15de1e8..25b61ebb0 100755
--- a/test/hyphenate.t
+++ b/test/hyphenate.t
@@ -87,4 +87,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/ids.t b/test/ids.t
index c3c26d7dc..d97c46a5d 100755
--- a/test/ids.t
+++ b/test/ids.t
@@ -115,4 +115,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/import.t b/test/import.t
index 8f4154e95..4431dea7e 100755
--- a/test/import.t
+++ b/test/import.t
@@ -306,4 +306,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/info.t b/test/info.t
index c0760eba6..52e9bd552 100755
--- a/test/info.t
+++ b/test/info.t
@@ -92,4 +92,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/json_test.t b/test/json_test.t
index fe19180c7..06fcfcec7 100755
--- a/test/json_test.t
+++ b/test/json_test.t
@@ -80,4 +80,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/limit.t b/test/limit.t
index 5e98ca0c4..586cb767f 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -104,4 +104,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index 8d7b1994c..a90024b57 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -61,4 +61,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/log.t b/test/log.t
index cf2231bad..a3e17a6aa 100755
--- a/test/log.t
+++ b/test/log.t
@@ -61,4 +61,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/logo.t b/test/logo.t
index 5ae5bd76d..669621d3c 100755
--- a/test/logo.t
+++ b/test/logo.t
@@ -50,4 +50,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/math.t b/test/math.t
index fa714a4d5..4158bd628 100755
--- a/test/math.t
+++ b/test/math.t
@@ -89,4 +89,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/nag.t b/test/nag.t
index ff7981d5c..21fcbf7fc 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -74,4 +74,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/obfuscate.t b/test/obfuscate.t
index d929817df..a7f7673da 100755
--- a/test/obfuscate.t
+++ b/test/obfuscate.t
@@ -69,4 +69,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/oldest.t b/test/oldest.t
index aea0346ab..d68775d0b 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -120,4 +120,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/operators.t b/test/operators.t
index a96d87c77..a3b057688 100755
--- a/test/operators.t
+++ b/test/operators.t
@@ -424,4 +424,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/overdue.t b/test/overdue.t
index c5e827010..9e4fcfdeb 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/partial.t b/test/partial.t
index 6f9257818..4624d5666 100755
--- a/test/partial.t
+++ b/test/partial.t
@@ -55,4 +55,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/prepend.t b/test/prepend.t
index fa9d1789f..d954e5d1f 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/pri_sort.t b/test/pri_sort.t
index 7409451af..93440ee3e 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -113,4 +113,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/project.t b/test/project.t
index d746b246c..a42f11de2 100755
--- a/test/project.t
+++ b/test/project.t
@@ -342,4 +342,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/rc.override.t b/test/rc.override.t
index ac8f3dfe7..6674b0cc2 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -74,4 +74,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/recurrence.t b/test/recurrence.t
index 05ef2043f..61383bfe5 100755
--- a/test/recurrence.t
+++ b/test/recurrence.t
@@ -412,4 +412,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/reports.t b/test/reports.t
index b5fd9a2a7..200e91886 100755
--- a/test/reports.t
+++ b/test/reports.t
@@ -52,4 +52,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/search.t b/test/search.t
index 4e1d0e1d2..485eff5d0 100755
--- a/test/search.t
+++ b/test/search.t
@@ -109,4 +109,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/sequence.t b/test/sequence.t
index 6af9e7bcd..47face9ef 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -93,4 +93,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/shell.t b/test/shell.t
index 3e7353385..d5bdc27bc 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -56,4 +56,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/show.t b/test/show.t
index c12581183..14d838ba7 100755
--- a/test/show.t
+++ b/test/show.t
@@ -87,4 +87,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/sorting.t b/test/sorting.t
index a1e266dc2..cd39cb94e 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -253,4 +253,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/special.t b/test/special.t
index 177ffe83e..551867d8e 100755
--- a/test/special.t
+++ b/test/special.t
@@ -68,4 +68,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/start.t b/test/start.t
index 0ae4f294b..4a3fa13f7 100755
--- a/test/start.t
+++ b/test/start.t
@@ -131,4 +131,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/stats.t b/test/stats.t
index d00f0a0ff..130cb03b3 100755
--- a/test/stats.t
+++ b/test/stats.t
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/subproject.t b/test/subproject.t
index 8ace6b9e1..c7a7809d3 100755
--- a/test/subproject.t
+++ b/test/subproject.t
@@ -78,4 +78,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/substitute.t b/test/substitute.t
index 1a9d4a292..b68bf74b2 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -89,4 +89,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/sugar.t b/test/sugar.t
index 5d7ddef2b..43df036ac 100755
--- a/test/sugar.t
+++ b/test/sugar.t
@@ -73,4 +73,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tag.t b/test/tag.t
index 1a28cee2d..ae50f2eab 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -492,4 +492,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/taskrc.t b/test/taskrc.t
index f3de4198f..de9c13fde 100755
--- a/test/taskrc.t
+++ b/test/taskrc.t
@@ -51,4 +51,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/template.t b/test/template.t
index db1039574..9588d19e3 100644
--- a/test/template.t
+++ b/test/template.t
@@ -230,4 +230,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/timesheet.t b/test/timesheet.t
index f4926fe65..192837485 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -101,4 +101,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-101.t b/test/tw-101.t
index 1f025f745..ee286f9ad 100755
--- a/test/tw-101.t
+++ b/test/tw-101.t
@@ -111,4 +111,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1262.t b/test/tw-1262.t
index b533611cf..c89692987 100755
--- a/test/tw-1262.t
+++ b/test/tw-1262.t
@@ -54,4 +54,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1300.t b/test/tw-1300.t
index 3f40b21dd..da005b399 100755
--- a/test/tw-1300.t
+++ b/test/tw-1300.t
@@ -55,4 +55,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1306.t b/test/tw-1306.t
index 59485baed..483cbdfc7 100755
--- a/test/tw-1306.t
+++ b/test/tw-1306.t
@@ -48,4 +48,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1319.t b/test/tw-1319.t
index 83d9ad551..b8835dcc3 100755
--- a/test/tw-1319.t
+++ b/test/tw-1319.t
@@ -62,4 +62,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1359.t b/test/tw-1359.t
index 84d5c2709..b975f4b09 100755
--- a/test/tw-1359.t
+++ b/test/tw-1359.t
@@ -49,4 +49,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1377.t b/test/tw-1377.t
index 16d1a2f9d..270e20f64 100755
--- a/test/tw-1377.t
+++ b/test/tw-1377.t
@@ -52,4 +52,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1379.t b/test/tw-1379.t
index a4fd6d845..8e6d03f39 100755
--- a/test/tw-1379.t
+++ b/test/tw-1379.t
@@ -162,4 +162,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1381.t b/test/tw-1381.t
index 71e5888ce..15fefbed4 100755
--- a/test/tw-1381.t
+++ b/test/tw-1381.t
@@ -51,4 +51,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1414.t b/test/tw-1414.t
index 8e139116c..571f1fa30 100755
--- a/test/tw-1414.t
+++ b/test/tw-1414.t
@@ -68,4 +68,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1418.t b/test/tw-1418.t
index 616d4b422..2746c4987 100755
--- a/test/tw-1418.t
+++ b/test/tw-1418.t
@@ -115,4 +115,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1419.t b/test/tw-1419.t
index 72781e5ec..1604e7002 100755
--- a/test/tw-1419.t
+++ b/test/tw-1419.t
@@ -52,4 +52,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1424.t b/test/tw-1424.t
index fb662a039..01262424a 100755
--- a/test/tw-1424.t
+++ b/test/tw-1424.t
@@ -69,4 +69,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1430.t b/test/tw-1430.t
index f2e0dce73..b1e1163d8 100755
--- a/test/tw-1430.t
+++ b/test/tw-1430.t
@@ -57,4 +57,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1436.t b/test/tw-1436.t
index f6bb8ff6e..7068ce453 100755
--- a/test/tw-1436.t
+++ b/test/tw-1436.t
@@ -86,4 +86,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1438.t b/test/tw-1438.t
index db48f3ed3..a736d3985 100755
--- a/test/tw-1438.t
+++ b/test/tw-1438.t
@@ -57,4 +57,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1441.t b/test/tw-1441.t
index aa08b355c..2e04c7083 100755
--- a/test/tw-1441.t
+++ b/test/tw-1441.t
@@ -50,4 +50,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1445.t b/test/tw-1445.t
index 6d3fe1b1d..845184606 100755
--- a/test/tw-1445.t
+++ b/test/tw-1445.t
@@ -61,4 +61,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1447.t b/test/tw-1447.t
index ca62cc6b7..170208165 100755
--- a/test/tw-1447.t
+++ b/test/tw-1447.t
@@ -53,4 +53,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1456.t b/test/tw-1456.t
index 790d1641f..26bfae8fc 100755
--- a/test/tw-1456.t
+++ b/test/tw-1456.t
@@ -56,4 +56,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1468.t b/test/tw-1468.t
index e11a55fcd..f25268901 100755
--- a/test/tw-1468.t
+++ b/test/tw-1468.t
@@ -60,4 +60,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1469.t b/test/tw-1469.t
index 1fbec9e6c..13526fd8e 100755
--- a/test/tw-1469.t
+++ b/test/tw-1469.t
@@ -106,4 +106,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1475.t b/test/tw-1475.t
index 08f782207..aa96c1405 100755
--- a/test/tw-1475.t
+++ b/test/tw-1475.t
@@ -59,4 +59,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1479.t b/test/tw-1479.t
index ba72f58b0..e02d2c068 100755
--- a/test/tw-1479.t
+++ b/test/tw-1479.t
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1486.t b/test/tw-1486.t
index 392b19f81..aacd066c5 100755
--- a/test/tw-1486.t
+++ b/test/tw-1486.t
@@ -56,4 +56,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1510.t b/test/tw-1510.t
index a46e412cb..86d0d0d27 100755
--- a/test/tw-1510.t
+++ b/test/tw-1510.t
@@ -85,4 +85,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1521.t b/test/tw-1521.t
index a5981df2b..fcb20f4eb 100755
--- a/test/tw-1521.t
+++ b/test/tw-1521.t
@@ -63,4 +63,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1527.t b/test/tw-1527.t
index 432cdbd94..ef093bea0 100755
--- a/test/tw-1527.t
+++ b/test/tw-1527.t
@@ -67,4 +67,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1542.t b/test/tw-1542.t
index bac34693a..bb36aa3ec 100755
--- a/test/tw-1542.t
+++ b/test/tw-1542.t
@@ -63,4 +63,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1549.t b/test/tw-1549.t
index cb8d5f0cf..266c311d5 100755
--- a/test/tw-1549.t
+++ b/test/tw-1549.t
@@ -60,4 +60,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1575.t b/test/tw-1575.t
index 873b97166..340529119 100755
--- a/test/tw-1575.t
+++ b/test/tw-1575.t
@@ -55,4 +55,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1609.t b/test/tw-1609.t
index b55a70544..2fd0c58c2 100755
--- a/test/tw-1609.t
+++ b/test/tw-1609.t
@@ -54,4 +54,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1612.t b/test/tw-1612.t
index 06e9c3b1c..27710cd35 100755
--- a/test/tw-1612.t
+++ b/test/tw-1612.t
@@ -71,4 +71,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1617.t b/test/tw-1617.t
index 84678e1e6..b6d678284 100755
--- a/test/tw-1617.t
+++ b/test/tw-1617.t
@@ -54,4 +54,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1622.t b/test/tw-1622.t
index 4178d42fe..79b1adc36 100755
--- a/test/tw-1622.t
+++ b/test/tw-1622.t
@@ -53,4 +53,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1627.t b/test/tw-1627.t
index cbeed8eef..72e0d2709 100755
--- a/test/tw-1627.t
+++ b/test/tw-1627.t
@@ -51,4 +51,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1630.t b/test/tw-1630.t
index 6d19dcb84..c4c0bd1e8 100755
--- a/test/tw-1630.t
+++ b/test/tw-1630.t
@@ -62,4 +62,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-1634.t b/test/tw-1634.t
index e04f47f2b..297d01d19 100755
--- a/test/tw-1634.t
+++ b/test/tw-1634.t
@@ -85,4 +85,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-20.t b/test/tw-20.t
index 05898c33e..e6d682116 100755
--- a/test/tw-20.t
+++ b/test/tw-20.t
@@ -76,4 +76,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-21.t b/test/tw-21.t
index 4abb567b8..f282f31f9 100755
--- a/test/tw-21.t
+++ b/test/tw-21.t
@@ -53,4 +53,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-252.t b/test/tw-252.t
index 37799157f..6678dc110 100755
--- a/test/tw-252.t
+++ b/test/tw-252.t
@@ -71,4 +71,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-262.t b/test/tw-262.t
index 2f69d7af9..f2c98769b 100755
--- a/test/tw-262.t
+++ b/test/tw-262.t
@@ -103,4 +103,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-268.t b/test/tw-268.t
index b03a32713..ed4066590 100755
--- a/test/tw-268.t
+++ b/test/tw-268.t
@@ -52,4 +52,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-295.t b/test/tw-295.t
index 2efa2adf0..c12df23dd 100755
--- a/test/tw-295.t
+++ b/test/tw-295.t
@@ -58,4 +58,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/tw-46.t b/test/tw-46.t
index 79c07d709..2acb9fa29 100755
--- a/test/tw-46.t
+++ b/test/tw-46.t
@@ -56,4 +56,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/uda.t b/test/uda.t
index c910c0ca4..8b66dadec 100755
--- a/test/uda.t
+++ b/test/uda.t
@@ -246,4 +246,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/uda_orphan.t b/test/uda_orphan.t
index a2b27febb..b92909b1e 100755
--- a/test/uda_orphan.t
+++ b/test/uda_orphan.t
@@ -87,4 +87,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/uda_report.t b/test/uda_report.t
index 56241b25d..7e80c5abd 100755
--- a/test/uda_report.t
+++ b/test/uda_report.t
@@ -72,4 +72,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/uda_sort.t b/test/uda_sort.t
index ff4a0a384..01651e4be 100755
--- a/test/uda_sort.t
+++ b/test/uda_sort.t
@@ -95,4 +95,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/undo.t b/test/undo.t
index 335d6b347..79e94f859 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -86,4 +86,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/unicode.t b/test/unicode.t
index 9ab8349c4..1f8a8804e 100755
--- a/test/unicode.t
+++ b/test/unicode.t
@@ -101,4 +101,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/unique.t b/test/unique.t
index ab53e01aa..7e0f4aafe 100755
--- a/test/unique.t
+++ b/test/unique.t
@@ -86,4 +86,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/upgrade.t b/test/upgrade.t
index 4eed18e1c..fe69bb634 100755
--- a/test/upgrade.t
+++ b/test/upgrade.t
@@ -63,4 +63,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/urgency.t b/test/urgency.t
index 0def637ef..d356d773e 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -286,4 +286,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/urgency_inherit.t b/test/urgency_inherit.t
index b5487a44d..eaa1ed45c 100755
--- a/test/urgency_inherit.t
+++ b/test/urgency_inherit.t
@@ -81,4 +81,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/uuid.t b/test/uuid.t
index a0ebe5a2a..45b480a00 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -201,4 +201,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/verbose.t b/test/verbose.t
index f4cf0927e..c7d1946ed 100755
--- a/test/verbose.t
+++ b/test/verbose.t
@@ -127,4 +127,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/version.t b/test/version.t
index 4b91cf5d3..aff388ec4 100755
--- a/test/version.t
+++ b/test/version.t
@@ -119,4 +119,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python
diff --git a/test/wait.t b/test/wait.t
index 72f180d69..74e25d63c 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -87,4 +87,4 @@ if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())
 
-# vim: ai sts=4 et sw=4
+# vim: ai sts=4 et sw=4 ft=python