diff --git a/python-Django.changes b/python-Django.changes
index 5899f1f..8bb5e84 100644
--- a/python-Django.changes
+++ b/python-Django.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 20 10:37:10 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Clean up PYTHONPATH to make test_extra_tests_build_suite pass.
+
 -------------------------------------------------------------------
 Tue Dec  7 14:09:24 UTC 2021 - Alberto Planas Dominguez <aplanas@suse.com>
 
diff --git a/python-Django.spec b/python-Django.spec
index 220458f..64551fa 100644
--- a/python-Django.spec
+++ b/python-Django.spec
@@ -33,7 +33,6 @@ Source:         https://www.djangoproject.com/m/releases/4.0/Django-%{version}.t
 Source1:        https://media.djangoproject.com/pgp/Django-%{version}.checksum.txt#/Django-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source99:       python-Django-rpmlintrc
-Patch0:         skip_discoverrunnerextratestsdeprecationtests.diff
 BuildRequires:  %{python_module Jinja2 >= 2.9.2}
 BuildRequires:  %{python_module Pillow >= 6.2.0}
 BuildRequires:  %{python_module PyYAML}
@@ -125,9 +124,9 @@ export LANG=en_US.UTF8
 export PYTHONDONTWRITEBYTECODE=1
 %if %{with selenium}
 export PATH=%{_libdir}/chromium:$PATH
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:. xvfb-run $python tests/runtests.py -v 2 --selenium=chrome
+%python_expand PYTHONPATH=.:%{buildroot}%{$python_sitelib} xvfb-run $python tests/runtests.py -v 2 --selenium=chrome
 %else
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib}:. $python tests/runtests.py -v 2
+%python_expand PYTHONPATH=.:%{buildroot}%{$python_sitelib} $python tests/runtests.py -v 2
 %endif
 
 %post
diff --git a/skip_discoverrunnerextratestsdeprecationtests.diff b/skip_discoverrunnerextratestsdeprecationtests.diff
deleted file mode 100644
index 5da15b4..0000000
--- a/skip_discoverrunnerextratestsdeprecationtests.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Django-4.0/tests/test_runner/tests.py
-===================================================================
---- Django-4.0.orig/tests/test_runner/tests.py
-+++ Django-4.0/tests/test_runner/tests.py
-@@ -841,6 +841,7 @@ class DiscoverRunnerExtraTestsDeprecatio
-     def get_runner(self):
-         return NoOpTestRunner(verbosity=0, interactive=False)
- 
-+    @unittest.skip("possible unittest issue")
-     def test_extra_tests_build_suite(self):
-         runner = self.get_runner()
-         with self.assertWarnsMessage(RemovedInDjango50Warning, self.msg):