11 files changed, 12 insertions, 28 deletions
diff --git a/test/git/test_actor.py b/test/git/test_actor.py
index 2fc7781f..14b78f19 100644
--- a/test/git/test_actor.py
+++ b/test/git/test_actor.py
@@ -1,7 +1,6 @@
 import os
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestActor(object):
     def test_from_string_should_separate_name_and_email(self):
diff --git a/test/git/test_blob.py b/test/git/test_blob.py
index f41429a6..1d84e1d8 100644
--- a/test/git/test_blob.py
+++ b/test/git/test_blob.py
@@ -1,8 +1,6 @@
 import time
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestBlob(object):
     def setup(self):
diff --git a/test/git/test_commit.py b/test/git/test_commit.py
index 825eba5a..65e92812 100644
--- a/test/git/test_commit.py
+++ b/test/git/test_commit.py
@@ -1,7 +1,5 @@
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestCommit(object):
     def setup(self):
diff --git a/test/git/test_diff.py b/test/git/test_diff.py
index c9352a18..b605eddd 100644
--- a/test/git/test_diff.py
+++ b/test/git/test_diff.py
@@ -1,6 +1,5 @@
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestDiff(object):
     def setup(self):
diff --git a/test/git/test_git.py b/test/git/test_git.py
index 973f242a..0634a5dd 100644
--- a/test/git/test_git.py
+++ b/test/git/test_git.py
@@ -1,8 +1,6 @@
 import os
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestGit(object):
     def setup(self):
diff --git a/test/git/test_head.py b/test/git/test_head.py
index fff3c0a0..47cfb608 100644
--- a/test/git/test_head.py
+++ b/test/git/test_head.py
@@ -1,7 +1,5 @@
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestHead(object):
     def setup(self):
diff --git a/test/git/test_repo.py b/test/git/test_repo.py
index 09238c66..af567811 100644
--- a/test/git/test_repo.py
+++ b/test/git/test_repo.py
@@ -1,9 +1,7 @@
 import os
 import time
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestRepo(object):
     def setup(self):
diff --git a/test/git/test_stats.py b/test/git/test_stats.py
index 36e35e40..4926ac4f 100644
--- a/test/git/test_stats.py
+++ b/test/git/test_stats.py
@@ -1,6 +1,5 @@
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestStats(object):
     def setup(self):
diff --git a/test/git/test_tag.py b/test/git/test_tag.py
index 14a0990d..fb9613c8 100644
--- a/test/git/test_tag.py
+++ b/test/git/test_tag.py
@@ -1,7 +1,7 @@
 from mock import *
-from test.asserts import *
-from git_python import *
+from test.testlib import *
 from test.helper import *
+from git_python import *
 
 class TestTag(object):
     def setup(self):
diff --git a/test/git/test_tree.py b/test/git/test_tree.py
index 3739a704..5d8dea67 100644
--- a/test/git/test_tree.py
+++ b/test/git/test_tree.py
@@ -1,7 +1,5 @@
-from mock import *
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestTree(object):
     def setup(self):
diff --git a/test/git/test_utils.py b/test/git/test_utils.py
index e3b23b2a..a9af2040 100644
--- a/test/git/test_utils.py
+++ b/test/git/test_utils.py
@@ -1,7 +1,6 @@
 import os
-from test.asserts import *
+from test.testlib import *
 from git_python import *
-from test.helper import *
 
 class TestUtils(object):
     def setup(self):