diff --git a/test/__init__.py b/test/__init__.py
index ac53525..2379757 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
 #
 # Copyright 2010 Google, Inc.
 #
diff --git a/test/test_blob.py b/test/test_blob.py
index 96e4de0..42d92d1 100644
--- a/test/test_blob.py
+++ b/test/test_blob.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
 #
 # Copyright 2010 Google, Inc.
 #
diff --git a/test/test_commit.py b/test/test_commit.py
index 168173a..7fd2989 100644
--- a/test/test_commit.py
+++ b/test/test_commit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
 #
 # Copyright 2010 Google, Inc.
 #
diff --git a/test/test_index.py b/test/test_index.py
index 2da7e5d..3c51792 100644
--- a/test/test_index.py
+++ b/test/test_index.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
 # Copyright 2011 Itaapy
diff --git a/test/test_refs.py b/test/test_refs.py
index de2f868..6f4ae84 100644
--- a/test/test_refs.py
+++ b/test/test_refs.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
 # Copyright 2011 Itaapy
diff --git a/test/test_repository.py b/test/test_repository.py
index 36643dc..65a83d8 100644
--- a/test/test_repository.py
+++ b/test/test_repository.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
 #
 # Copyright 2010 Google, Inc.
 #
diff --git a/test/test_revwalk.py b/test/test_revwalk.py
index cc65d98..6180260 100644
--- a/test/test_revwalk.py
+++ b/test/test_revwalk.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
 # Copyright 2011 Itaapy
diff --git a/test/test_status.py b/test/test_status.py
index e594b5a..39d6462 100644
--- a/test/test_status.py
+++ b/test/test_status.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 #
 # Copyright 2011 Julien Miotte
diff --git a/test/test_tag.py b/test/test_tag.py
index 402a3a9..5c7eb12 100644
--- a/test/test_tag.py
+++ b/test/test_tag.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
 #
 # Copyright 2010 Google, Inc.
 #
diff --git a/test/test_tree.py b/test/test_tree.py
index 3252c69..2b26ddd 100644
--- a/test/test_tree.py
+++ b/test/test_tree.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
 #
 # Copyright 2010 Google, Inc.
 #
diff --git a/test/utils.py b/test/utils.py
index 6ccf909..55035cb 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+#
 # Copyright 2010 Google, Inc.
 #
 # This file is free software; you can redistribute it and/or modify