diff --git a/test/test_blob.py b/test/test_blob.py
index 65082af..40a7e06 100644
--- a/test/test_blob.py
+++ b/test/test_blob.py
@@ -27,13 +27,15 @@
 
 """Tests for Blob objects."""
 
-__author__ = 'dborowitz@google.com (Dave Borowitz)'
-
+from __future__ import unicode_literals
 import unittest
 
 import pygit2
 import utils
 
+
+__author__ = 'dborowitz@google.com (Dave Borowitz)'
+
 BLOB_SHA = 'af431f20fc541ed6d5afede3e2dc7160f6f01f16'
 
 
diff --git a/test/test_commit.py b/test/test_commit.py
index e308961..6834826 100644
--- a/test/test_commit.py
+++ b/test/test_commit.py
@@ -27,13 +27,15 @@
 
 """Tests for Commit objects."""
 
-__author__ = 'dborowitz@google.com (Dave Borowitz)'
-
+from __future__ import unicode_literals
 import unittest
 
 from pygit2 import GIT_OBJ_COMMIT
 import utils
 
+
+__author__ = 'dborowitz@google.com (Dave Borowitz)'
+
 COMMIT_SHA = '5fe808e8953c12735680c257f56600cb0de44b10'
 
 
diff --git a/test/test_index.py b/test/test_index.py
index 0f3b5d1..7ea6045 100644
--- a/test/test_index.py
+++ b/test/test_index.py
@@ -28,14 +28,16 @@
 
 """Tests for Index files."""
 
-__author__ = 'jdavid@itaapy.com (J. David Ibáñez)'
-
-import unittest
+from __future__ import unicode_literals
 import os
-
-import utils
+import unittest
 
 import pygit2
+import utils
+
+
+__author__ = 'jdavid@itaapy.com (J. David Ibáñez)'
+
 
 class IndexBareTest(utils.BareRepoTestCase):
 
diff --git a/test/test_refs.py b/test/test_refs.py
index 575560e..8b16122 100644
--- a/test/test_refs.py
+++ b/test/test_refs.py
@@ -28,15 +28,15 @@
 
 """Tests for reference objects."""
 
+from __future__ import unicode_literals
+import unittest
+
+from pygit2 import GIT_REF_OID, GIT_REF_SYMBOLIC
+import utils
+
 
 __author__ = 'david.versmisse@itaapy.com (David Versmisse)'
 
-import unittest
-import utils
-from pygit2 import GIT_REF_OID, GIT_REF_SYMBOLIC
-
-
-
 LAST_COMMIT = '2be5719152d4f82c7302b1c0932d8e5f0a4a0e98'
 
 
diff --git a/test/test_repository.py b/test/test_repository.py
index ed1535b..d34f868 100644
--- a/test/test_repository.py
+++ b/test/test_repository.py
@@ -27,8 +27,7 @@
 
 """Tests for Repository objects."""
 
-__author__ = 'dborowitz@google.com (Dave Borowitz)'
-
+from __future__ import unicode_literals
 import binascii
 import unittest
 import os
@@ -38,6 +37,9 @@ from pygit2 import (GitError, GIT_OBJ_ANY, GIT_OBJ_BLOB, GIT_OBJ_COMMIT,
         init_repository)
 import utils
 
+
+__author__ = 'dborowitz@google.com (Dave Borowitz)'
+
 A_HEX_SHA = 'af431f20fc541ed6d5afede3e2dc7160f6f01f16'
 A_BIN_SHA = binascii.unhexlify(A_HEX_SHA)
 
diff --git a/test/test_revwalk.py b/test/test_revwalk.py
index 4bf5275..5ea2497 100644
--- a/test/test_revwalk.py
+++ b/test/test_revwalk.py
@@ -28,13 +28,16 @@
 
 """Tests for revision walk."""
 
-__author__ = 'jdavid@itaapy.com (J. David Ibáñez)'
-
+from __future__ import unicode_literals
 import unittest
 
 from pygit2 import GIT_SORT_TIME, GIT_SORT_REVERSE
 import utils
 
+
+__author__ = 'jdavid@itaapy.com (J. David Ibáñez)'
+
+
 # In the order given by git log
 log = [
     '2be5719152d4f82c7302b1c0932d8e5f0a4a0e98',
diff --git a/test/test_status.py b/test/test_status.py
index 41dc4db..a01d671 100644
--- a/test/test_status.py
+++ b/test/test_status.py
@@ -28,13 +28,15 @@
 
 """Tests for revision walk."""
 
-__author__ = 'mike.perdide@gmail.com (Julien Miotte)'
-
+from __future__ import unicode_literals
 import unittest
 
 import pygit2
 import utils
 
+
+__author__ = 'mike.perdide@gmail.com (Julien Miotte)'
+
 EXPECTED = {
  "current_file":                    pygit2.GIT_STATUS_CURRENT,
  "file_deleted":                    pygit2.GIT_STATUS_WT_DELETED,
diff --git a/test/test_tag.py b/test/test_tag.py
index 8b3a598..d797c4d 100644
--- a/test/test_tag.py
+++ b/test/test_tag.py
@@ -27,13 +27,15 @@
 
 """Tests for Tag objects."""
 
-__author__ = 'dborowitz@google.com (Dave Borowitz)'
-
+from __future__ import unicode_literals
 import unittest
 
 import pygit2
 import utils
 
+
+__author__ = 'dborowitz@google.com (Dave Borowitz)'
+
 TAG_SHA = '3d2962987c695a29f1f80b6c3aa4ec046ef44369'
 
 
diff --git a/test/test_tree.py b/test/test_tree.py
index b48308f..96b7e97 100644
--- a/test/test_tree.py
+++ b/test/test_tree.py
@@ -27,14 +27,16 @@
 
 """Tests for Commit objects."""
 
-__author__ = 'dborowitz@google.com (Dave Borowitz)'
-
+from __future__ import unicode_literals
 import operator
 import unittest
 
 import pygit2
 import utils
 
+
+__author__ = 'dborowitz@google.com (Dave Borowitz)'
+
 TREE_SHA = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
 SUBTREE_SHA = '614fd9a3094bf618ea938fffc00e7d1a54f89ad0'
 
diff --git a/test/utils.py b/test/utils.py
index f531e45..6ccf909 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -25,8 +25,6 @@
 
 """Test utilities for libgit2."""
 
-__author__ = 'dborowitz@google.com (Dave Borowitz)'
-
 import os
 import shutil
 import tarfile
@@ -36,6 +34,9 @@ import unittest
 import pygit2
 
 
+__author__ = 'dborowitz@google.com (Dave Borowitz)'
+
+
 class BaseTestCase(unittest.TestCase):
 
     def tearDown(self):