diff --git a/.deepsource.toml b/.deepsource.toml
@@ -1,7 +1,7 @@
version = 1

test_patterns = [
-  'git/test/**/test_*.py'
]

exclude_patterns = [

diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
-git/test/fixtures/* eol=lf
init-tests-after-clone.sh
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -40,7 +40,7 @@ jobs:
        git config --global user.name "Travis Runner"
        # If we rewrite the user's config by accident, we will mess it up
        # and cause subsequent tests to fail
-        cat git/test/fixtures/.gitconfig >> ~/.gitconfig
    - name: Lint with flake8
      run: |
        set -x

diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ script:
  # Make sure we limit open handles to see if we are leaking them
  - ulimit -n 128
  - ulimit -n
-  - coverage run --omit="git/test/*" -m unittest --buffer
  - coverage report
  - if [ "$TRAVIS_PYTHON_VERSION" == '3.5' ]; then cd doc && make html; fi
  - if [ "$TRAVIS_PYTHON_VERSION" == '3.6' ]; then flake8 --ignore=W293,E265,E266,W503,W504,E731; fi

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,11 +5,8 @@ include AUTHORS
include CONTRIBUTING.md
include README.md
include requirements.txt
-include test-requirements.txt

recursive-include doc *
-
-graft git/test/fixtures
-graft git/test/performance

global-exclude __pycache__ *.pyc
diff --git a/git/test/__init__.py → test/__init__.py b/git/test/__init__.py → test/__init__.py
diff --git a/git/test/fixtures/blame → test/fixtures/blame b/git/test/fixtures/blame → test/fixtures/blame
diff --git a/git/test/fixtures/blame_binary → test/fixtures/blame_binary b/git/test/fixtures/blame_binary → test/fixtures/blame_binary
diff --git a/git/test/fixtures/blame_complex_revision → test/fixtures/blame_complex_revision b/git/test/fixtures/blame_complex_revision → test/fixtures/blame_complex_revision
diff --git a/git/test/fixtures/blame_incremental → test/fixtures/blame_incremental b/git/test/fixtures/blame_incremental → test/fixtures/blame_incremental
diff --git a/...st/fixtures/blame_incremental_2.11.1_plus → test/fixtures/blame_incremental_2.11.1_plus b/...st/fixtures/blame_incremental_2.11.1_plus → test/fixtures/blame_incremental_2.11.1_plus
diff --git a/git/test/fixtures/cat_file_blob → test/fixtures/cat_file_blob b/git/test/fixtures/cat_file_blob → test/fixtures/cat_file_blob
diff --git a/git/test/fixtures/cat_file_blob_nl → test/fixtures/cat_file_blob_nl b/git/test/fixtures/cat_file_blob_nl → test/fixtures/cat_file_blob_nl
diff --git a/git/test/fixtures/cat_file_blob_size → test/fixtures/cat_file_blob_size b/git/test/fixtures/cat_file_blob_size → test/fixtures/cat_file_blob_size
diff --git a/git/test/fixtures/commit_invalid_data → test/fixtures/commit_invalid_data b/git/test/fixtures/commit_invalid_data → test/fixtures/commit_invalid_data
diff --git a/git/test/fixtures/commit_with_gpgsig → test/fixtures/commit_with_gpgsig b/git/test/fixtures/commit_with_gpgsig → test/fixtures/commit_with_gpgsig
diff --git a/git/test/fixtures/diff_2 → test/fixtures/diff_2 b/git/test/fixtures/diff_2 → test/fixtures/diff_2
diff --git a/git/test/fixtures/diff_2f → test/fixtures/diff_2f b/git/test/fixtures/diff_2f → test/fixtures/diff_2f
diff --git a/.../diff_abbrev-40_full-index_M_raw_no-color → .../diff_abbrev-40_full-index_M_raw_no-color b/.../diff_abbrev-40_full-index_M_raw_no-color → .../diff_abbrev-40_full-index_M_raw_no-color
diff --git a/git/test/fixtures/diff_change_in_type → test/fixtures/diff_change_in_type b/git/test/fixtures/diff_change_in_type → test/fixtures/diff_change_in_type
diff --git a/git/test/fixtures/diff_change_in_type_raw → test/fixtures/diff_change_in_type_raw b/git/test/fixtures/diff_change_in_type_raw → test/fixtures/diff_change_in_type_raw
diff --git a/git/test/fixtures/diff_copied_mode → test/fixtures/diff_copied_mode b/git/test/fixtures/diff_copied_mode → test/fixtures/diff_copied_mode
diff --git a/git/test/fixtures/diff_f → test/fixtures/diff_f b/git/test/fixtures/diff_f → test/fixtures/diff_f
diff --git a/git/test/fixtures/diff_file_with_spaces → test/fixtures/diff_file_with_spaces b/git/test/fixtures/diff_file_with_spaces → test/fixtures/diff_file_with_spaces
diff --git a/git/test/fixtures/diff_i → test/fixtures/diff_i b/git/test/fixtures/diff_i → test/fixtures/diff_i
diff --git a/git/test/fixtures/diff_index_patch → test/fixtures/diff_index_patch b/git/test/fixtures/diff_index_patch → test/fixtures/diff_index_patch
@@ -56,26 +56,26 @@ index f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3..a88a777df3909a61be97f1a7b1194dad
@@ -1 +1 @@
-Subproject commit f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3
+Subproject commit a88a777df3909a61be97f1a7b1194dad6de25702-dirty
-diff --git a/git/test/fixtures/diff_patch_binary b/git/test/fixtures/diff_patch_binary
new file mode 100644
index 0000000000000000000000000000000000000000..c92ccd6ebc92a871d38ad7cb8a48bcdb1a5dbc33
--- /dev/null
-+++ b/git/test/fixtures/diff_patch_binary
@@ -0,0 +1,3 @@
+diff --git a/rps b/rps
+index f4567df37451b230b1381b1bc9c2bcad76e08a3c..736bd596a36924d30b480942e9475ce0d734fa0d 100755
+Binary files a/rps and b/rps differ
-diff --git a/git/test/fixtures/diff_raw_binary b/git/test/fixtures/diff_raw_binary
new file mode 100644
index 0000000000000000000000000000000000000000..d4673fa41ee8413384167fc7b9f25e4daf18a53a
--- /dev/null
-+++ b/git/test/fixtures/diff_raw_binary
@@ -0,0 +1 @@
+:100755 100755 f4567df37451b230b1381b1bc9c2bcad76e08a3c 736bd596a36924d30b480942e9475ce0d734fa0d M	rps
-diff --git a/git/test/test_diff.py b/git/test/test_diff.py
index ce0f64f2261bd8de063233108caac1f26742c1fd..4de26f8884fd048ac7f10007f2bf7c7fa3fa60f4 100644
---- a/git/test/test_diff.py
-+++ b/git/test/test_diff.py
@@ -65,6 +65,21 @@ class TestDiff(TestBase):
         assert diff.rename_to == 'that'
         assert len(list(diffs.iter_change_type('R'))) == 1

diff --git a/git/test/fixtures/diff_index_raw → test/fixtures/diff_index_raw b/git/test/fixtures/diff_index_raw → test/fixtures/diff_index_raw
diff --git a/git/test/fixtures/diff_new_mode → test/fixtures/diff_new_mode b/git/test/fixtures/diff_new_mode → test/fixtures/diff_new_mode
diff --git a/git/test/fixtures/diff_numstat → test/fixtures/diff_numstat b/git/test/fixtures/diff_numstat → test/fixtures/diff_numstat
diff --git a/git/test/fixtures/diff_p → test/fixtures/diff_p b/git/test/fixtures/diff_p → test/fixtures/diff_p
diff --git a/git/test/fixtures/diff_patch_binary → test/fixtures/diff_patch_binary b/git/test/fixtures/diff_patch_binary → test/fixtures/diff_patch_binary
diff --git a/git/test/fixtures/diff_rename → test/fixtures/diff_rename b/git/test/fixtures/diff_rename → test/fixtures/diff_rename
diff --git a/git/test/fixtures/diff_rename_raw → test/fixtures/diff_rename_raw b/git/test/fixtures/diff_rename_raw → test/fixtures/diff_rename_raw
diff --git a/git/test/fixtures/diff_tree_numstat_root → test/fixtures/diff_tree_numstat_root b/git/test/fixtures/diff_tree_numstat_root → test/fixtures/diff_tree_numstat_root
diff --git a/...fixtures/for_each_ref_with_path_component → ...fixtures/for_each_ref_with_path_component b/...fixtures/for_each_ref_with_path_component → ...fixtures/for_each_ref_with_path_component
diff --git a/git/test/fixtures/git_config → test/fixtures/git_config b/git/test/fixtures/git_config → test/fixtures/git_config
diff --git a/git/test/fixtures/git_config_global → test/fixtures/git_config_global b/git/test/fixtures/git_config_global → test/fixtures/git_config_global
diff --git a/...test/fixtures/git_config_with_empty_value → test/fixtures/git_config_with_empty_value b/...test/fixtures/git_config_with_empty_value → test/fixtures/git_config_with_empty_value
diff --git a/git/test/fixtures/git_file → test/fixtures/git_file b/git/test/fixtures/git_file → test/fixtures/git_file
diff --git a/git/test/fixtures/issue-301_stderr → test/fixtures/issue-301_stderr b/git/test/fixtures/issue-301_stderr → test/fixtures/issue-301_stderr
diff --git a/git/test/fixtures/ls_tree_a → test/fixtures/ls_tree_a b/git/test/fixtures/ls_tree_a → test/fixtures/ls_tree_a
diff --git a/git/test/fixtures/ls_tree_b → test/fixtures/ls_tree_b b/git/test/fixtures/ls_tree_b → test/fixtures/ls_tree_b
diff --git a/git/test/fixtures/ls_tree_commit → test/fixtures/ls_tree_commit b/git/test/fixtures/ls_tree_commit → test/fixtures/ls_tree_commit
diff --git a/git/test/fixtures/ls_tree_empty → test/fixtures/ls_tree_empty b/git/test/fixtures/ls_tree_empty → test/fixtures/ls_tree_empty
diff --git a/git/test/fixtures/reflog_invalid_email → test/fixtures/reflog_invalid_email b/git/test/fixtures/reflog_invalid_email → test/fixtures/reflog_invalid_email
diff --git a/git/test/fixtures/reflog_invalid_newsha → test/fixtures/reflog_invalid_newsha b/git/test/fixtures/reflog_invalid_newsha → test/fixtures/reflog_invalid_newsha
diff --git a/git/test/fixtures/reflog_invalid_sep → test/fixtures/reflog_invalid_sep b/git/test/fixtures/reflog_invalid_sep → test/fixtures/reflog_invalid_sep
diff --git a/git/test/fixtures/rev_list → test/fixtures/rev_list b/git/test/fixtures/rev_list → test/fixtures/rev_list
diff --git a/git/test/fixtures/rev_list_bisect_all → test/fixtures/rev_list_bisect_all b/git/test/fixtures/rev_list_bisect_all → test/fixtures/rev_list_bisect_all
diff --git a/git/test/fixtures/rev_list_commit_idabbrev → test/fixtures/rev_list_commit_idabbrev b/git/test/fixtures/rev_list_commit_idabbrev → test/fixtures/rev_list_commit_idabbrev
diff --git a/git/test/fixtures/rev_list_commit_stats → test/fixtures/rev_list_commit_stats b/git/test/fixtures/rev_list_commit_stats → test/fixtures/rev_list_commit_stats
diff --git a/git/test/fixtures/rev_list_count → test/fixtures/rev_list_count b/git/test/fixtures/rev_list_count → test/fixtures/rev_list_count
diff --git a/git/test/fixtures/rev_list_delta_a → test/fixtures/rev_list_delta_a b/git/test/fixtures/rev_list_delta_a → test/fixtures/rev_list_delta_a
diff --git a/git/test/fixtures/rev_list_delta_b → test/fixtures/rev_list_delta_b b/git/test/fixtures/rev_list_delta_b → test/fixtures/rev_list_delta_b
diff --git a/git/test/fixtures/rev_list_single → test/fixtures/rev_list_single b/git/test/fixtures/rev_list_single → test/fixtures/rev_list_single
diff --git a/git/test/fixtures/rev_parse → test/fixtures/rev_parse b/git/test/fixtures/rev_parse → test/fixtures/rev_parse
diff --git a/git/test/fixtures/show_empty_commit → test/fixtures/show_empty_commit b/git/test/fixtures/show_empty_commit → test/fixtures/show_empty_commit
diff --git a/...st/fixtures/uncommon_branch_prefix_stderr → test/fixtures/uncommon_branch_prefix_stderr b/...st/fixtures/uncommon_branch_prefix_stderr → test/fixtures/uncommon_branch_prefix_stderr
diff --git a/git/test/lib/helper.py → test/lib/helper.py b/git/test/lib/helper.py → test/lib/helper.py
@@ -29,7 +29,7 @@

ospd = osp.dirname

-GIT_REPO = os.environ.get("GIT_PYTHON_TEST_GIT_REPO_BASE", ospd(ospd(ospd(ospd(__file__)))))
GIT_DAEMON_PORT = os.environ.get("GIT_PYTHON_TEST_GIT_DAEMON_PORT", "19418")

__all__ = (

diff --git a/git/test/performance/__init__.py → test/performance/__init__.py b/git/test/performance/__init__.py → test/performance/__init__.py
diff --git a/git/test/performance/lib.py → test/performance/lib.py b/git/test/performance/lib.py → test/performance/lib.py
@@ -10,7 +10,7 @@
    GitCmdObjectDB,
    GitDB
)
-from git.test.lib import (
    TestBase
)
from git.util import rmtree

diff --git a/git/test/performance/test_streams.py → test/performance/test_streams.py b/git/test/performance/test_streams.py → test/performance/test_streams.py
@@ -6,7 +6,7 @@
import sys
from time import time

-from git.test.lib import (
    with_rw_repo
)
from git.util import bin_to_hex

diff --git a/git/test/test_actor.py → test/test_actor.py b/git/test/test_actor.py → test/test_actor.py
@@ -4,7 +4,7 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php

-from git.test.lib import TestBase
from git import Actor



diff --git a/git/test/test_base.py → test/test_base.py b/git/test/test_base.py → test/test_base.py
@@ -17,7 +17,7 @@
)
from git.compat import is_win
from git.objects.util import get_object_type_by_name
-from git.test.lib import (
    TestBase,
    with_rw_repo,
    with_rw_and_rw_remote_repo

diff --git a/git/test/test_blob.py → test/test_blob.py b/git/test/test_blob.py → test/test_blob.py
@@ -4,7 +4,7 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php

-from git.test.lib import TestBase
from git import Blob



diff --git a/git/test/test_commit.py → test/test_commit.py b/git/test/test_commit.py → test/test_commit.py
@@ -20,13 +20,13 @@
from git import Repo
from git.objects.util import tzoffset, utc
from git.repo.fun import touch
-from git.test.lib import (
    TestBase,
    with_rw_repo,
    fixture_path,
    StringProcessAdapter
)
-from git.test.lib import with_rw_directory
from gitdb import IStream

import os.path as osp

diff --git a/git/test/test_db.py → test/test_db.py b/git/test/test_db.py → test/test_db.py
@@ -5,7 +5,7 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
from git.db import GitCmdObjectDB
from git.exc import BadObject
-from git.test.lib import TestBase
from git.util import bin_to_hex

import os.path as osp

diff --git a/git/test/test_diff.py → test/test_diff.py b/git/test/test_diff.py → test/test_diff.py
@@ -16,12 +16,12 @@
    Submodule,
)
from git.cmd import Git
-from git.test.lib import (
    TestBase,
    StringProcessAdapter,
    fixture,
)
-from git.test.lib import with_rw_directory

import os.path as osp


diff --git a/git/test/test_docs.py → test/test_docs.py b/git/test/test_docs.py → test/test_docs.py
@@ -6,8 +6,8 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os

-from git.test.lib import TestBase
-from git.test.lib.helper import with_rw_directory

import os.path


diff --git a/git/test/test_exc.py → test/test_exc.py b/git/test/test_exc.py → test/test_exc.py
@@ -22,7 +22,7 @@
    HookExecutionError,
    RepositoryDirtyError,
)
-from git.test.lib import TestBase

import itertools as itt


diff --git a/git/test/test_fun.py → test/test_fun.py b/git/test/test_fun.py → test/test_fun.py
@@ -18,7 +18,7 @@
from git.repo.fun import (
    find_worktree_git_dir
)
-from git.test.lib import (
    TestBase,
    with_rw_repo,
    with_rw_directory

diff --git a/git/test/test_index.py → test/test_index.py b/git/test/test_index.py → test/test_index.py
@@ -36,13 +36,13 @@
    IndexEntry
)
from git.objects import Blob
-from git.test.lib import (
    TestBase,
    fixture_path,
    fixture,
    with_rw_repo
)
-from git.test.lib import with_rw_directory
from git.util import Actor, rmtree
from git.util import HIDE_WINDOWS_KNOWN_ERRORS, hex_to_bin
from gitdb.base import IStream

diff --git a/git/test/test_refs.py → test/test_refs.py b/git/test/test_refs.py → test/test_refs.py
@@ -17,7 +17,7 @@
    RefLog
)
from git.objects.tag import TagObject
-from git.test.lib import (
    TestBase,
    with_rw_repo
)

diff --git a/git/test/test_remote.py → test/test_remote.py b/git/test/test_remote.py → test/test_remote.py
@@ -22,7 +22,7 @@
    GitCommandError
)
from git.cmd import Git
-from git.test.lib import (
    TestBase,
    with_rw_repo,
    with_rw_and_rw_remote_repo,

diff --git a/git/test/test_repo.py → test/test_repo.py b/git/test/test_repo.py → test/test_repo.py
@@ -36,13 +36,13 @@
    BadObject,
)
from git.repo.fun import touch
-from git.test.lib import (
    TestBase,
    with_rw_repo,
    fixture
)
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, bin_to_hex

import os.path as osp
@@ -865,7 +865,7 @@ def last_commit(repo, rev, path):
        for _ in range(64):
            for repo_type in (GitCmdObjectDB, GitDB):
                repo = Repo(self.rorepo.working_tree_dir, odbt=repo_type)
-                last_commit(repo, 'master', 'git/test/test_base.py')
            # end for each repository type
        # end for each iteration


diff --git a/git/test/test_stats.py → test/test_stats.py b/git/test/test_stats.py → test/test_stats.py
@@ -4,7 +4,7 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php

-from git.test.lib import (
    TestBase,
    fixture
)

diff --git a/git/test/test_submodule.py → test/test_submodule.py b/git/test/test_submodule.py → test/test_submodule.py
@@ -19,11 +19,11 @@
    find_submodule_git_dir,
    touch
)
-from git.test.lib import (
    TestBase,
    with_rw_repo
)
-from git.test.lib import with_rw_directory
from git.util import HIDE_WINDOWS_KNOWN_ERRORS
from git.util import to_native_path_linux, join_path_native
import os.path as osp

diff --git a/git/test/test_tree.py → test/test_tree.py b/git/test/test_tree.py → test/test_tree.py
@@ -12,7 +12,7 @@
    Tree,
    Blob
)
-from git.test.lib import TestBase
from git.util import HIDE_WINDOWS_KNOWN_ERRORS

import os.path as osp

diff --git a/git/test/test_util.py → test/test_util.py b/git/test/test_util.py → test/test_util.py
@@ -21,7 +21,7 @@
    parse_date,
    tzoffset,
    from_timestamp)
-from git.test.lib import TestBase
from git.util import (
    LockFile,
    BlockingLockFile,
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		git/test/fixtures/* eol=lf
		init-tests-after-clone.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
         Tree,
         Blob
     )
-    from git.test.lib import TestBase
     from git.util import HIDE_WINDOWS_KNOWN_ERRORS
     import os.path as osp
@@ Expand Down @@