Revert moving tests out of 'git' folder, related to #1030

104 files changed, 50 insertions, 47 deletions

diff --git a/.deepsource.toml b/.deepsource.toml
index d55288b8..6e2f9d92 100644
--- a/.deepsource.toml
+++ b/.deepsource.toml
@@ -1,7 +1,7 @@
 version = 1
 
 test_patterns = [
-  'test/**/test_*.py'
+  'git/test/**/test_*.py'
 ]
 
 exclude_patterns = [
diff --git a/.gitattributes b/.gitattributes
index 6d2618f2..872b8eb4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-test/fixtures/* eol=lf
+git/test/fixtures/* eol=lf
 init-tests-after-clone.sh
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index a4f76522..b52cb74b 100644
--- 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 test/fixtures/.gitconfig >> ~/.gitconfig
+        cat git/test/fixtures/.gitconfig >> ~/.gitconfig
     - name: Lint with flake8
       run: |
         set -x
diff --git a/.travis.yml b/.travis.yml
index 1fbb1ddb..9cbd94a8 100644
--- 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="test/*" -m unittest --buffer
+  - 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
index 5fd771db..e6bf5249 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,8 +5,11 @@ include AUTHORS
 include CONTRIBUTING.md
 include README.md
 include requirements.txt
+include test-requirements.txt
 
 recursive-include doc *
-recursive-exclude test *
+
+graft git/test/fixtures
+graft git/test/performance
 
 global-exclude __pycache__ *.pyc
diff --git a/test/__init__.py b/git/test/__init__.py
index 757cbad1..757cbad1 100644
--- a/test/__init__.py
+++ b/git/test/__init__.py
diff --git a/test/fixtures/.gitconfig b/git/test/fixtures/.gitconfig
index 6a0459f6..6a0459f6 100644
--- a/test/fixtures/.gitconfig
+++ b/git/test/fixtures/.gitconfig
diff --git a/test/fixtures/blame b/git/test/fixtures/blame
index 10c141dd..10c141dd 100644
--- a/test/fixtures/blame
+++ b/git/test/fixtures/blame
diff --git a/test/fixtures/blame_binary b/git/test/fixtures/blame_binary
index db78205b..db78205b 100644
--- a/test/fixtures/blame_binary
+++ b/git/test/fixtures/blame_binary
diff --git a/test/fixtures/blame_complex_revision b/git/test/fixtures/blame_complex_revision
index e2de6d37..e2de6d37 100644
--- a/test/fixtures/blame_complex_revision
+++ b/git/test/fixtures/blame_complex_revision
diff --git a/test/fixtures/blame_incremental b/git/test/fixtures/blame_incremental
index 67310aec..67310aec 100644
--- a/test/fixtures/blame_incremental
+++ b/git/test/fixtures/blame_incremental
diff --git a/test/fixtures/blame_incremental_2.11.1_plus b/git/test/fixtures/blame_incremental_2.11.1_plus
index beee7011..beee7011 100644
--- a/test/fixtures/blame_incremental_2.11.1_plus
+++ b/git/test/fixtures/blame_incremental_2.11.1_plus
diff --git a/test/fixtures/cat_file.py b/git/test/fixtures/cat_file.py
index 5480e628..5480e628 100644
--- a/test/fixtures/cat_file.py
+++ b/git/test/fixtures/cat_file.py
diff --git a/test/fixtures/cat_file_blob b/git/test/fixtures/cat_file_blob
index 70c379b6..70c379b6 100644
--- a/test/fixtures/cat_file_blob
+++ b/git/test/fixtures/cat_file_blob
diff --git a/test/fixtures/cat_file_blob_nl b/git/test/fixtures/cat_file_blob_nl
index 802992c4..802992c4 100644
--- a/test/fixtures/cat_file_blob_nl
+++ b/git/test/fixtures/cat_file_blob_nl
diff --git a/test/fixtures/cat_file_blob_size b/git/test/fixtures/cat_file_blob_size
index b4de3947..b4de3947 100644
--- a/test/fixtures/cat_file_blob_size
+++ b/git/test/fixtures/cat_file_blob_size
diff --git a/test/fixtures/commit_invalid_data b/git/test/fixtures/commit_invalid_data
index d112bf2d..d112bf2d 100644
--- a/test/fixtures/commit_invalid_data
+++ b/git/test/fixtures/commit_invalid_data
diff --git a/test/fixtures/commit_with_gpgsig b/git/test/fixtures/commit_with_gpgsig
index f38cdabd..f38cdabd 100644
--- a/test/fixtures/commit_with_gpgsig
+++ b/git/test/fixtures/commit_with_gpgsig
diff --git a/test/fixtures/diff_2 b/git/test/fixtures/diff_2
index 218b6bae..218b6bae 100644
--- a/test/fixtures/diff_2
+++ b/git/test/fixtures/diff_2
diff --git a/test/fixtures/diff_2f b/git/test/fixtures/diff_2f
index 5246cd6b..5246cd6b 100644
--- a/test/fixtures/diff_2f
+++ b/git/test/fixtures/diff_2f
diff --git a/test/fixtures/diff_abbrev-40_full-index_M_raw_no-color b/git/test/fixtures/diff_abbrev-40_full-index_M_raw_no-color
index dad85c68..dad85c68 100644
--- a/test/fixtures/diff_abbrev-40_full-index_M_raw_no-color
+++ b/git/test/fixtures/diff_abbrev-40_full-index_M_raw_no-color
diff --git a/test/fixtures/diff_change_in_type b/git/test/fixtures/diff_change_in_type
index e0ca7389..e0ca7389 100644
--- a/test/fixtures/diff_change_in_type
+++ b/git/test/fixtures/diff_change_in_type
diff --git a/test/fixtures/diff_change_in_type_raw b/git/test/fixtures/diff_change_in_type_raw
index 0793e1bb..0793e1bb 100644
--- a/test/fixtures/diff_change_in_type_raw
+++ b/git/test/fixtures/diff_change_in_type_raw
diff --git a/test/fixtures/diff_copied_mode b/git/test/fixtures/diff_copied_mode
index 60707afc..60707afc 100644
--- a/test/fixtures/diff_copied_mode
+++ b/git/test/fixtures/diff_copied_mode
diff --git a/test/fixtures/diff_copied_mode_raw b/git/test/fixtures/diff_copied_mode_raw
index 7640f3ab..7640f3ab 100644
--- a/test/fixtures/diff_copied_mode_raw
+++ b/git/test/fixtures/diff_copied_mode_raw
diff --git a/test/fixtures/diff_f b/git/test/fixtures/diff_f
index 48a49256..48a49256 100644
--- a/test/fixtures/diff_f
+++ b/git/test/fixtures/diff_f
diff --git a/test/fixtures/diff_file_with_spaces b/git/test/fixtures/diff_file_with_spaces
index a9f0b06c..a9f0b06c 100644
--- a/test/fixtures/diff_file_with_spaces
+++ b/git/test/fixtures/diff_file_with_spaces
diff --git a/test/fixtures/diff_i b/git/test/fixtures/diff_i
index cec64e1d..cec64e1d 100644
--- a/test/fixtures/diff_i
+++ b/git/test/fixtures/diff_i
diff --git a/test/fixtures/diff_index_patch b/git/test/fixtures/diff_index_patch
index f617f8de..a5a8cff2 100644
--- a/test/fixtures/diff_index_patch
+++ b/git/test/fixtures/diff_index_patch
@@ -56,26 +56,26 @@ index f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3..a88a777df3909a61be97f1a7b1194dad
 @@ -1 +1 @@
 -Subproject commit f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3
 +Subproject commit a88a777df3909a61be97f1a7b1194dad6de25702-dirty
-diff --git a/test/fixtures/diff_patch_binary b/test/fixtures/diff_patch_binary
+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/test/fixtures/diff_patch_binary
++++ 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/test/fixtures/diff_raw_binary b/test/fixtures/diff_raw_binary
+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/test/fixtures/diff_raw_binary
++++ b/git/test/fixtures/diff_raw_binary
 @@ -0,0 +1 @@
 +:100755 100755 f4567df37451b230b1381b1bc9c2bcad76e08a3c 736bd596a36924d30b480942e9475ce0d734fa0d M	rps
-diff --git a/test/test_diff.py b/test/test_diff.py
+diff --git a/git/test/test_diff.py b/git/test/test_diff.py
 index ce0f64f2261bd8de063233108caac1f26742c1fd..4de26f8884fd048ac7f10007f2bf7c7fa3fa60f4 100644
---- a/test/test_diff.py
-+++ b/test/test_diff.py
+--- 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/test/fixtures/diff_index_raw b/git/test/fixtures/diff_index_raw
index c25f380d..c25f380d 100644
--- a/test/fixtures/diff_index_raw
+++ b/git/test/fixtures/diff_index_raw
diff --git a/test/fixtures/diff_initial b/git/test/fixtures/diff_initial
index 648d7043..648d7043 100644
--- a/test/fixtures/diff_initial
+++ b/git/test/fixtures/diff_initial
diff --git a/test/fixtures/diff_mode_only b/git/test/fixtures/diff_mode_only
index 6fc18f69..6fc18f69 100755
--- a/test/fixtures/diff_mode_only
+++ b/git/test/fixtures/diff_mode_only
diff --git a/test/fixtures/diff_new_mode b/git/test/fixtures/diff_new_mode
index 29705386..29705386 100644
--- a/test/fixtures/diff_new_mode
+++ b/git/test/fixtures/diff_new_mode
diff --git a/test/fixtures/diff_numstat b/git/test/fixtures/diff_numstat
index 44c6ca2d..44c6ca2d 100644
--- a/test/fixtures/diff_numstat
+++ b/git/test/fixtures/diff_numstat
diff --git a/test/fixtures/diff_p b/git/test/fixtures/diff_p
index af4759e5..af4759e5 100644
--- a/test/fixtures/diff_p
+++ b/git/test/fixtures/diff_p
diff --git a/test/fixtures/diff_patch_binary b/git/test/fixtures/diff_patch_binary
index c92ccd6e..c92ccd6e 100644
--- a/test/fixtures/diff_patch_binary
+++ b/git/test/fixtures/diff_patch_binary
diff --git a/test/fixtures/diff_patch_unsafe_paths b/git/test/fixtures/diff_patch_unsafe_paths
index 1aad6754..1aad6754 100644
--- a/test/fixtures/diff_patch_unsafe_paths
+++ b/git/test/fixtures/diff_patch_unsafe_paths
diff --git a/test/fixtures/diff_raw_binary b/git/test/fixtures/diff_raw_binary
index d4673fa4..d4673fa4 100644
--- a/test/fixtures/diff_raw_binary
+++ b/git/test/fixtures/diff_raw_binary
diff --git a/test/fixtures/diff_rename b/git/test/fixtures/diff_rename
index 2d5241e3..2d5241e3 100644
--- a/test/fixtures/diff_rename
+++ b/git/test/fixtures/diff_rename
diff --git a/test/fixtures/diff_rename_raw b/git/test/fixtures/diff_rename_raw
index 92d06d22..92d06d22 100644
--- a/test/fixtures/diff_rename_raw
+++ b/git/test/fixtures/diff_rename_raw
diff --git a/test/fixtures/diff_tree_numstat_root b/git/test/fixtures/diff_tree_numstat_root
index bebdaa6d..bebdaa6d 100644
--- a/test/fixtures/diff_tree_numstat_root
+++ b/git/test/fixtures/diff_tree_numstat_root
diff --git a/test/fixtures/for_each_ref_with_path_component b/git/test/fixtures/for_each_ref_with_path_component
index e723b4ae..e723b4ae 100644
--- a/test/fixtures/for_each_ref_with_path_component
+++ b/git/test/fixtures/for_each_ref_with_path_component
diff --git a/test/fixtures/git_config b/git/test/fixtures/git_config
index b8c178e3..b8c178e3 100644
--- a/test/fixtures/git_config
+++ b/git/test/fixtures/git_config
diff --git a/test/fixtures/git_config-inc.cfg b/git/test/fixtures/git_config-inc.cfg
index 2368ec20..2368ec20 100644
--- a/test/fixtures/git_config-inc.cfg
+++ b/git/test/fixtures/git_config-inc.cfg
diff --git a/test/fixtures/git_config_global b/git/test/fixtures/git_config_global
index 56fbd3b3..56fbd3b3 100644
--- a/test/fixtures/git_config_global
+++ b/git/test/fixtures/git_config_global
diff --git a/test/fixtures/git_config_multiple b/git/test/fixtures/git_config_multiple
index 03a97568..03a97568 100644
--- a/test/fixtures/git_config_multiple
+++ b/git/test/fixtures/git_config_multiple
diff --git a/test/fixtures/git_config_with_comments b/git/test/fixtures/git_config_with_comments
index e9d4443d..e9d4443d 100644
--- a/test/fixtures/git_config_with_comments
+++ b/git/test/fixtures/git_config_with_comments
diff --git a/test/fixtures/git_config_with_empty_value b/git/test/fixtures/git_config_with_empty_value
index 0427caea..0427caea 100644
--- a/test/fixtures/git_config_with_empty_value
+++ b/git/test/fixtures/git_config_with_empty_value
diff --git a/test/fixtures/git_file b/git/test/fixtures/git_file
index 2efda9f5..2efda9f5 100644
--- a/test/fixtures/git_file
+++ b/git/test/fixtures/git_file
diff --git a/test/fixtures/index b/git/test/fixtures/index
index 40914bac..40914bac 100644
--- a/test/fixtures/index
+++ b/git/test/fixtures/index
diff --git a/test/fixtures/index_merge b/git/test/fixtures/index_merge
index 2a743455..2a743455 100644
--- a/test/fixtures/index_merge
+++ b/git/test/fixtures/index_merge
diff --git a/test/fixtures/issue-301_stderr b/git/test/fixtures/issue-301_stderr
index 3da0ed15..3da0ed15 100644
--- a/test/fixtures/issue-301_stderr
+++ b/git/test/fixtures/issue-301_stderr
diff --git a/test/fixtures/ls_tree_a b/git/test/fixtures/ls_tree_a
index 69b76f4a..69b76f4a 100644
--- a/test/fixtures/ls_tree_a
+++ b/git/test/fixtures/ls_tree_a
diff --git a/test/fixtures/ls_tree_b b/git/test/fixtures/ls_tree_b
index 329aff39..329aff39 100644
--- a/test/fixtures/ls_tree_b
+++ b/git/test/fixtures/ls_tree_b
diff --git a/test/fixtures/ls_tree_commit b/git/test/fixtures/ls_tree_commit
index d97aca04..d97aca04 100644
--- a/test/fixtures/ls_tree_commit
+++ b/git/test/fixtures/ls_tree_commit
diff --git a/test/fixtures/ls_tree_empty b/git/test/fixtures/ls_tree_empty
index e69de29b..e69de29b 100644
--- a/test/fixtures/ls_tree_empty
+++ b/git/test/fixtures/ls_tree_empty
diff --git a/test/fixtures/reflog_HEAD b/git/test/fixtures/reflog_HEAD
index 7b2272ac..7b2272ac 100644
--- a/test/fixtures/reflog_HEAD
+++ b/git/test/fixtures/reflog_HEAD
diff --git a/test/fixtures/reflog_invalid_date b/git/test/fixtures/reflog_invalid_date
index 938e4f75..938e4f75 100644
--- a/test/fixtures/reflog_invalid_date
+++ b/git/test/fixtures/reflog_invalid_date
diff --git a/test/fixtures/reflog_invalid_email b/git/test/fixtures/reflog_invalid_email
index 121096aa..121096aa 100644
--- a/test/fixtures/reflog_invalid_email
+++ b/git/test/fixtures/reflog_invalid_email
diff --git a/test/fixtures/reflog_invalid_newsha b/git/test/fixtures/reflog_invalid_newsha
index 0d45bb7a..0d45bb7a 100644
--- a/test/fixtures/reflog_invalid_newsha
+++ b/git/test/fixtures/reflog_invalid_newsha
diff --git a/test/fixtures/reflog_invalid_oldsha b/git/test/fixtures/reflog_invalid_oldsha
index b78605ff..b78605ff 100644
--- a/test/fixtures/reflog_invalid_oldsha
+++ b/git/test/fixtures/reflog_invalid_oldsha
diff --git a/test/fixtures/reflog_invalid_sep b/git/test/fixtures/reflog_invalid_sep
index fddcd6e5..fddcd6e5 100644
--- a/test/fixtures/reflog_invalid_sep
+++ b/git/test/fixtures/reflog_invalid_sep
diff --git a/test/fixtures/reflog_master b/git/test/fixtures/reflog_master
index 2fa13e21..2fa13e21 100644
--- a/test/fixtures/reflog_master
+++ b/git/test/fixtures/reflog_master
diff --git a/test/fixtures/rev_list b/git/test/fixtures/rev_list
index 1a576118..1a576118 100644
--- a/test/fixtures/rev_list
+++ b/git/test/fixtures/rev_list
diff --git a/test/fixtures/rev_list_bisect_all b/git/test/fixtures/rev_list_bisect_all
index 810b6609..810b6609 100644
--- a/test/fixtures/rev_list_bisect_all
+++ b/git/test/fixtures/rev_list_bisect_all
diff --git a/test/fixtures/rev_list_commit_diffs b/git/test/fixtures/rev_list_commit_diffs
index 20397e2e..20397e2e 100644
--- a/test/fixtures/rev_list_commit_diffs
+++ b/git/test/fixtures/rev_list_commit_diffs
diff --git a/test/fixtures/rev_list_commit_idabbrev b/git/test/fixtures/rev_list_commit_idabbrev
index 9385ba71..9385ba71 100644
--- a/test/fixtures/rev_list_commit_idabbrev
+++ b/git/test/fixtures/rev_list_commit_idabbrev
diff --git a/test/fixtures/rev_list_commit_stats b/git/test/fixtures/rev_list_commit_stats
index 60aa8cf5..60aa8cf5 100644
--- a/test/fixtures/rev_list_commit_stats
+++ b/git/test/fixtures/rev_list_commit_stats
diff --git a/test/fixtures/rev_list_count b/git/test/fixtures/rev_list_count
index a802c139..a802c139 100644
--- a/test/fixtures/rev_list_count
+++ b/git/test/fixtures/rev_list_count
diff --git a/test/fixtures/rev_list_delta_a b/git/test/fixtures/rev_list_delta_a
index 023c5515..023c5515 100644
--- a/test/fixtures/rev_list_delta_a
+++ b/git/test/fixtures/rev_list_delta_a
diff --git a/test/fixtures/rev_list_delta_b b/git/test/fixtures/rev_list_delta_b
index aea7187f..aea7187f 100644
--- a/test/fixtures/rev_list_delta_b
+++ b/git/test/fixtures/rev_list_delta_b
diff --git a/test/fixtures/rev_list_single b/git/test/fixtures/rev_list_single
index d8c6431e..d8c6431e 100644
--- a/test/fixtures/rev_list_single
+++ b/git/test/fixtures/rev_list_single
diff --git a/test/fixtures/rev_parse b/git/test/fixtures/rev_parse
index a639d89e..a639d89e 100644
--- a/test/fixtures/rev_parse
+++ b/git/test/fixtures/rev_parse
diff --git a/test/fixtures/show_empty_commit b/git/test/fixtures/show_empty_commit
index ea25e32a..ea25e32a 100644
--- a/test/fixtures/show_empty_commit
+++ b/git/test/fixtures/show_empty_commit
diff --git a/test/fixtures/uncommon_branch_prefix_FETCH_HEAD b/git/test/fixtures/uncommon_branch_prefix_FETCH_HEAD
index 7df36f24..7df36f24 100644
--- a/test/fixtures/uncommon_branch_prefix_FETCH_HEAD
+++ b/git/test/fixtures/uncommon_branch_prefix_FETCH_HEAD
diff --git a/test/fixtures/uncommon_branch_prefix_stderr b/git/test/fixtures/uncommon_branch_prefix_stderr
index 5a6aca65..5a6aca65 100644
--- a/test/fixtures/uncommon_branch_prefix_stderr
+++ b/git/test/fixtures/uncommon_branch_prefix_stderr
diff --git a/test/lib/__init__.py b/git/test/lib/__init__.py
index 1551ce45..1551ce45 100644
--- a/test/lib/__init__.py
+++ b/git/test/lib/__init__.py
diff --git a/test/lib/helper.py b/git/test/lib/helper.py
index 3412786d..8de66e8a 100644
--- a/test/lib/helper.py
+++ b/git/test/lib/helper.py
@@ -29,7 +29,7 @@ skipIf = unittest.skipIf
 
 ospd = osp.dirname
 
-GIT_REPO = os.environ.get("GIT_PYTHON_TEST_GIT_REPO_BASE", ospd(ospd(ospd(__file__))))
+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/test/performance/__init__.py b/git/test/performance/__init__.py
index e69de29b..e69de29b 100644
--- a/test/performance/__init__.py
+++ b/git/test/performance/__init__.py
diff --git a/test/performance/lib.py b/git/test/performance/lib.py
index 86f87757..7edffa78 100644
--- a/test/performance/lib.py
+++ b/git/test/performance/lib.py
@@ -10,7 +10,7 @@ from git.db import (
     GitCmdObjectDB,
     GitDB
 )
-from test.lib import (
+from git.test.lib import (
     TestBase
 )
 from git.util import rmtree
diff --git a/test/performance/test_commit.py b/git/test/performance/test_commit.py
index 4617b052..578194a2 100644
--- a/test/performance/test_commit.py
+++ b/git/test/performance/test_commit.py
@@ -11,7 +11,7 @@ import sys
 from .lib import TestBigRepoRW
 from git import Commit
 from gitdb import IStream
-from test.test_commit import TestCommitSerialization
+from git.test.test_commit import TestCommitSerialization
 
 
 class TestPerformance(TestBigRepoRW, TestCommitSerialization):
diff --git a/test/performance/test_odb.py b/git/test/performance/test_odb.py
index 8bd614f2..8bd614f2 100644
--- a/test/performance/test_odb.py
+++ b/git/test/performance/test_odb.py
diff --git a/test/performance/test_streams.py b/git/test/performance/test_streams.py
index edf32c91..cc6f0335 100644
--- a/test/performance/test_streams.py
+++ b/git/test/performance/test_streams.py
@@ -6,7 +6,7 @@ import subprocess
 import sys
 from time import time
 
-from test.lib import (
+from git.test.lib import (
     with_rw_repo
 )
 from git.util import bin_to_hex
diff --git a/test/test_actor.py b/git/test/test_actor.py
index 32d16ea7..010b82f6 100644
--- a/test/test_actor.py
+++ b/git/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 test.lib import TestBase
+from git.test.lib import TestBase
 from git import Actor
 
 
diff --git a/test/test_base.py b/git/test/test_base.py
index 02963ce0..9da7c471 100644
--- a/test/test_base.py
+++ b/git/test/test_base.py
@@ -17,7 +17,7 @@ from git import (
 )
 from git.compat import is_win
 from git.objects.util import get_object_type_by_name
-from test.lib import (
+from git.test.lib import (
     TestBase,
     with_rw_repo,
     with_rw_and_rw_remote_repo
diff --git a/test/test_blob.py b/git/test/test_blob.py
index c9c8c48a..88c50501 100644
--- a/test/test_blob.py
+++ b/git/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 test.lib import TestBase
+from git.test.lib import TestBase
 from git import Blob
 
 
diff --git a/test/test_commit.py b/git/test/test_commit.py
index 0292545f..2b901e8b 100644
--- a/test/test_commit.py
+++ b/git/test/test_commit.py
@@ -20,13 +20,13 @@ from git import (
 from git import Repo
 from git.objects.util import tzoffset, utc
 from git.repo.fun import touch
-from test.lib import (
+from git.test.lib import (
     TestBase,
     with_rw_repo,
     fixture_path,
     StringProcessAdapter
 )
-from test.lib import with_rw_directory
+from git.test.lib import with_rw_directory
 from gitdb import IStream
 
 import os.path as osp
diff --git a/test/test_config.py b/git/test/test_config.py
index 720d775e..8418299f 100644
--- a/test/test_config.py
+++ b/git/test/test_config.py
@@ -11,12 +11,12 @@ from git import (
     GitConfigParser
 )
 from git.config import _OMD, cp
-from test.lib import (
+from git.test.lib import (
     TestCase,
     fixture_path,
     SkipTest,
 )
-from test.lib import with_rw_directory
+from git.test.lib import with_rw_directory
 
 import os.path as osp
 from git.util import rmfile
diff --git a/test/test_db.py b/git/test/test_db.py
index f9090fdd..bd16452d 100644
--- a/test/test_db.py
+++ b/git/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 test.lib import TestBase
+from git.test.lib import TestBase
 from git.util import bin_to_hex
 
 import os.path as osp
diff --git a/test/test_diff.py b/git/test/test_diff.py
index 378a58de..0b4c1aa6 100644
--- a/test/test_diff.py
+++ b/git/test/test_diff.py
@@ -16,12 +16,12 @@ from git import (
     Submodule,
 )
 from git.cmd import Git
-from test.lib import (
+from git.test.lib import (
     TestBase,
     StringProcessAdapter,
     fixture,
 )
-from test.lib import with_rw_directory
+from git.test.lib import with_rw_directory
 
 import os.path as osp
 
diff --git a/test/test_docs.py b/git/test/test_docs.py
index 15c8f8d7..2e4f1dbf 100644
--- a/test/test_docs.py
+++ b/git/test/test_docs.py
@@ -6,8 +6,8 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import os
 
-from test.lib import TestBase
-from test.lib.helper import with_rw_directory
+from git.test.lib import TestBase
+from git.test.lib.helper import with_rw_directory
 
 import os.path
 
diff --git a/test/test_exc.py b/git/test/test_exc.py
index f16498ab..8024ec78 100644
--- a/test/test_exc.py
+++ b/git/test/test_exc.py
@@ -22,7 +22,7 @@ from git.exc import (
     HookExecutionError,
     RepositoryDirtyError,
 )
-from test.lib import TestBase
+from git.test.lib import TestBase
 
 import itertools as itt
 
diff --git a/test/test_fun.py b/git/test/test_fun.py
index a7fb8f8b..b0d1d8b6 100644
--- a/test/test_fun.py
+++ b/git/test/test_fun.py
@@ -18,7 +18,7 @@ from git.objects.fun import (
 from git.repo.fun import (
     find_worktree_git_dir
 )
-from test.lib import (
+from git.test.lib import (
     TestBase,
     with_rw_repo,
     with_rw_directory
diff --git a/test/test_git.py b/git/test/test_git.py
index 72c7ef62..1e3cac8f 100644
--- a/test/test_git.py
+++ b/git/test/test_git.py
@@ -19,11 +19,11 @@ from git import (
     cmd
 )
 from git.compat import is_darwin
-from test.lib import (
+from git.test.lib import (
     TestBase,
     fixture_path
 )
-from test.lib import with_rw_directory
+from git.test.lib import with_rw_directory
 from git.util import finalize_process
 
 import os.path as osp
diff --git a/test/test_index.py b/git/test/test_index.py
index 1107f21d..ce14537a 100644
--- a/test/test_index.py
+++ b/git/test/test_index.py
@@ -36,13 +36,13 @@ from git.index.typ import (
     IndexEntry
 )
 from git.objects import Blob
-from test.lib import (
+from git.test.lib import (
     TestBase,
     fixture_path,
     fixture,
     with_rw_repo
 )
-from test.lib import with_rw_directory
+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/test/test_reflog.py b/git/test/test_reflog.py
index a6c15950..db5f2783 100644
--- a/test/test_reflog.py
+++ b/git/test/test_reflog.py
@@ -6,7 +6,7 @@ from git.refs import (
     RefLogEntry,
     RefLog
 )
-from test.lib import (
+from git.test.lib import (
     TestBase,
     fixture_path
 )
diff --git a/test/test_refs.py b/git/test/test_refs.py
index 8ab45d22..4a0ebfde 100644
--- a/test/test_refs.py
+++ b/git/test/test_refs.py
@@ -17,7 +17,7 @@ from git import (
     RefLog
 )
 from git.objects.tag import TagObject
-from test.lib import (
+from git.test.lib import (
     TestBase,
     with_rw_repo
 )
diff --git a/test/test_remote.py b/git/test/test_remote.py
index fb7d23c6..c659dd32 100644
--- a/test/test_remote.py
+++ b/git/test/test_remote.py
@@ -22,7 +22,7 @@ from git import (
     GitCommandError
 )
 from git.cmd import Git
-from test.lib import (
+from git.test.lib import (
     TestBase,
     with_rw_repo,
     with_rw_and_rw_remote_repo,
diff --git a/test/test_repo.py b/git/test/test_repo.py
index 0809175f..590e303e 100644
--- a/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -36,13 +36,13 @@ from git.exc import (
     BadObject,
 )
 from git.repo.fun import touch
-from test.lib import (
+from git.test.lib import (
     TestBase,
     with_rw_repo,
     fixture
 )
 from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath
-from test.lib import with_rw_directory
+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 @@ class TestRepo(TestBase):
         for _ in range(64):
             for repo_type in (GitCmdObjectDB, GitDB):
                 repo = Repo(self.rorepo.working_tree_dir, odbt=repo_type)
-                last_commit(repo, 'master', 'test/test_base.py')
+                last_commit(repo, 'master', 'git/test/test_base.py')
             # end for each repository type
         # end for each iteration
 
diff --git a/test/test_stats.py b/git/test/test_stats.py
index 2759698a..92f5c8aa 100644
--- a/test/test_stats.py
+++ b/git/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 test.lib import (
+from git.test.lib import (
     TestBase,
     fixture
 )
diff --git a/test/test_submodule.py b/git/test/test_submodule.py
index eb821b54..dd036b7e 100644
--- a/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -19,11 +19,11 @@ from git.repo.fun import (
     find_submodule_git_dir,
     touch
 )
-from test.lib import (
+from git.test.lib import (
     TestBase,
     with_rw_repo
 )
-from test.lib import with_rw_directory
+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/test/test_tree.py b/git/test/test_tree.py
index 49b34c5e..213e7a95 100644
--- a/test/test_tree.py
+++ b/git/test/test_tree.py
@@ -12,7 +12,7 @@ from git import (
     Tree,
     Blob
 )
-from test.lib import TestBase
+from git.test.lib import TestBase
 from git.util import HIDE_WINDOWS_KNOWN_ERRORS
 
 import os.path as osp
diff --git a/test/test_util.py b/git/test/test_util.py
index 26695df5..77fbdeb9 100644
--- a/test/test_util.py
+++ b/git/test/test_util.py
@@ -21,7 +21,7 @@ from git.objects.util import (
     parse_date,
     tzoffset,
     from_timestamp)
-from test.lib import TestBase
+from git.test.lib import TestBase
 from git.util import (
     LockFile,
     BlockingLockFile,
diff --git a/setup.py b/setup.py
index 54e43bea..11a1d6b7 100755
--- a/setup.py
+++ b/setup.py
@@ -74,9 +74,9 @@ setup(
     author="Sebastian Thiel, Michael Trier",
     author_email="byronimo@gmail.com, mtrier@gmail.com",
     url="https://github.com/gitpython-developers/GitPython",
-    packages=find_packages(exclude=("test.*")),
-    include_package_data=True,
+    packages=find_packages('.'),
     py_modules=['git.' + f[:-3] for f in os.listdir('./git') if f.endswith('.py')],
+    package_data={'git.test': ['fixtures/*']},
     package_dir={'git': 'git'},
     python_requires='>=3.4',
     install_requires=requirements,