diff --git a/python-virtualenv.changes b/python-virtualenv.changes
index fe289d6..fb101fb 100644
--- a/python-virtualenv.changes
+++ b/python-virtualenv.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  8 15:04:16 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Skip test_xonsh on platforms we don't carry xonsh.
+
 -------------------------------------------------------------------
 Sat Dec 19 10:01:08 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index d2be76a..32682da 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-virtualenv
+# spec file for package python-virtualenv-test
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -39,13 +39,15 @@ BuildRequires:  python-rpm-macros
 Requires:       python-appdirs >= 1.4.3
 Requires:       python-distlib >= 0.3.1
 Requires:       python-filelock >= 3.0.0
-Requires:       python-importlib-metadata >= 0.12
-Requires:       python-importlib_resources >= 1.0
 Requires:       python-setuptools
 Requires:       python-six >= 1.9.0
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 BuildArch:      noarch
+%if %{python_version_nodots} < 38
+Requires:       python-importlib-metadata >= 0.12
+Requires:       python-importlib_resources >= 1.0
+%endif
 %ifpython2
 Requires:       python-contextlib2 >= 0.6.0
 Requires:       python-pathlib2 >= 2.3.3
@@ -62,12 +64,8 @@ BuildRequires:  %{python_module pytest-mock >= 2.0.0}
 BuildRequires:  %{python_module pytest-timeout >= 1.3.4}
 BuildRequires:  %{python_module virtualenv >= %{version}}
 BuildRequires:  fish
-%if 0%{?suse_version} >= 1550
-BuildRequires:  %{python_module xonsh >= 0.9.13}
-%else
-BuildRequires:  python3-xonsh >= 0.9.13
-%endif
 BuildRequires:  tcsh
+BuildRequires:  xonsh >= 0.9.13
 %endif
 %python_subpackages
 
@@ -105,8 +103,14 @@ libraries either).
 %check
 %if %{with test}
 export LANG="en_US.UTF8"
+skiptests="test_seed_link_via_app_data"
 # test_seed_link_via_app_data - online tests downloads from pypi
-%pytest -k 'not test_seed_link_via_app_data'
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} PYTHONDONTWRITEBYTECODE=1
+%if "%{$python_bin_suffix}" != "3.8"
+skiptests+=' or test_xonsh'
+%endif
+pytest-%{$python_bin_suffix} -v -k "not ($skiptests)"
+}
 %endif
 
 %if !%{with test}