7 files changed, 20 insertions, 26 deletions
diff --git a/git/test/performance/test_streams.py b/git/test/performance/test_streams.py
index 699aa25b..3909d8ff 100644
--- a/git/test/performance/test_streams.py
+++ b/git/test/performance/test_streams.py
@@ -9,12 +9,12 @@ from time import time
 from git.test.lib import (
     with_rw_repo
 )
+from git.util import bin_to_hex
 from gitdb import (
     LooseObjectDB,
     IStream
 )
 from gitdb.test.lib import make_memory_file
-from gitdb.util import bin_to_hex
 
 import os.path as osp
 
diff --git a/git/test/test_base.py b/git/test/test_base.py
index 576df961..cec40de8 100644
--- a/git/test/test_base.py
+++ b/git/test/test_base.py
@@ -23,7 +23,7 @@ from git.test.lib import (
     with_rw_repo,
     with_rw_and_rw_remote_repo
 )
-from gitdb.util import hex_to_bin
+from git.util import hex_to_bin
 
 import git.objects.base as base
 import os.path as osp
diff --git a/git/test/test_db.py b/git/test/test_db.py
index 1741e7b9..8f67dd48 100644
--- a/git/test/test_db.py
+++ b/git/test/test_db.py
@@ -6,7 +6,7 @@
 from git.db import GitCmdObjectDB
 from git.exc import BadObject
 from git.test.lib import TestBase
-from gitdb.util import bin_to_hex
+from git.util import bin_to_hex
 
 import os.path as osp
 
diff --git a/git/test/test_fun.py b/git/test/test_fun.py
index 40d040b9..3be25e3e 100644
--- a/git/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -1,6 +1,13 @@
-from git.test.lib import (
-    TestBase,
-    with_rw_repo
+from io import BytesIO
+from stat import (
+    S_IFDIR,
+    S_IFREG,
+    S_IFLNK
+)
+
+from git.index import IndexFile
+from git.index.fun import (
+    aggressive_tree_merge
 )
 from git.objects.fun import (
     traverse_tree_recursive,
@@ -8,24 +15,14 @@ from git.objects.fun import (
     tree_to_stream,
     tree_entries_from_data
 )
-
-from git.index.fun import (
-    aggressive_tree_merge
+from git.test.lib import (
+    TestBase,
+    with_rw_repo
 )
-
-from gitdb.util import bin_to_hex
+from git.util import bin_to_hex
 from gitdb.base import IStream
 from gitdb.typ import str_tree_type
 
-from stat import (
-    S_IFDIR,
-    S_IFREG,
-    S_IFLNK
-)
-
-from git.index import IndexFile
-from io import BytesIO
-
 
 class TestFun(TestBase):
 
diff --git a/git/test/test_index.py b/git/test/test_index.py
index 0fdc120c..99b35db7 100644
--- a/git/test/test_index.py
+++ b/git/test/test_index.py
@@ -45,9 +45,8 @@ from git.test.lib import (
 )
 from git.test.lib import with_rw_directory
 from git.util import Actor, rmtree
-from git.util import HIDE_WINDOWS_KNOWN_ERRORS
+from git.util import HIDE_WINDOWS_KNOWN_ERRORS, hex_to_bin
 from gitdb.base import IStream
-from gitdb.util import hex_to_bin
 
 import os.path as osp
 
diff --git a/git/test/test_reflog.py b/git/test/test_reflog.py
index e43a1dc0..20495be1 100644
--- a/git/test/test_reflog.py
+++ b/git/test/test_reflog.py
@@ -10,8 +10,7 @@ from git.test.lib import (
     TestBase,
     fixture_path
 )
-from git.util import Actor, rmtree
-from gitdb.util import hex_to_bin
+from git.util import Actor, rmtree, hex_to_bin
 
 import os.path as osp
 
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index 4b21db4b..495c4337 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -52,8 +52,7 @@ from git.test.lib import (
 )
 from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath
 from git.test.lib import with_rw_directory
-from git.util import join_path_native, rmtree, rmfile
-from gitdb.util import bin_to_hex
+from git.util import join_path_native, rmtree, rmfile, bin_to_hex
 from unittest import SkipTest
 
 import functools as fnt