diff --git a/tests/test_distributions.py b/tests/test_distributions.py
index c7738f9..6876a83 100644
--- a/tests/test_distributions.py
+++ b/tests/test_distributions.py
@@ -608,20 +608,28 @@ def test_wheel_wrong_dist_info(tmp_pathplus: PathPlus):
 				pytest.param(
 						"3.7",
 						marks=[
-								pytest.mark.skipif(
-										not ((3, 7) <= sys.version_info[:2] <= (3, 8)),
-										reason="Output differs on Python 3.7 & 3.8"
-										),
+								only_version(3.7, reason="Output differs on Python 3.7"),
 								not_pypy("Output differs on PyPy")
 								]
 						),
 				pytest.param(
 						"3.7-pypy",
 						marks=[
-								pytest.mark.skipif(
-										not ((3, 7) <= sys.version_info[:2] <= (3, 8)),
-										reason="Output differs on Python 3.7 & 3.8"
-										),
+								only_version(3.7, reason="Output differs on Python 3.7"),
+								only_pypy("Output differs on PyPy")
+								]
+						),
+				pytest.param(
+						"3.8",
+						marks=[
+								only_version(3.8, reason="Output differs on Python 3.8"),
+								not_pypy("Output differs on PyPy")
+								]
+						),
+				pytest.param(
+						"3.8-pypy",
+						marks=[
+								only_version(3.8, reason="Output differs on Python 3.8"),
 								only_pypy("Output differs on PyPy")
 								]
 						),
diff --git a/tests/test_distributions_/test_packages_distributions_3_7_.yml b/tests/test_distributions_/test_packages_distributions_3_7_.yml
index 19682c6..8e91693 100644
--- a/tests/test_distributions_/test_packages_distributions_3_7_.yml
+++ b/tests/test_distributions_/test_packages_distributions_3_7_.yml
@@ -61,9 +61,9 @@ idna:
 imagesize:
 - imagesize
 importlib_metadata:
-- importlib_metadata
+- importlib-metadata
 importlib_resources:
-- importlib_resources
+- importlib-resources
 iniconfig:
 - iniconfig
 jinja2:
diff --git a/tests/test_distributions_/test_packages_distributions_3_8_.yml b/tests/test_distributions_/test_packages_distributions_3_8_.yml
new file mode 100644
index 0000000..19682c6
--- /dev/null
+++ b/tests/test_distributions_/test_packages_distributions_3_8_.yml
@@ -0,0 +1,145 @@
+_distutils_hack:
+- setuptools
+_pytest:
+- pytest
+_yaml:
+- PyYAML
+alabaster:
+- alabaster
+apeye:
+- apeye
+apeye_core:
+- apeye-core
+atomicwrites:
+- atomicwrites
+attr:
+- attrs
+attrs:
+- attrs
+babel:
+- Babel
+certifi:
+- certifi
+charset_normalizer:
+- charset-normalizer
+click:
+- click
+coincidence:
+- coincidence
+colorama:
+- colorama
+consolekit:
+- consolekit
+coverage:
+- coverage
+coverage_pyver_pragma:
+- coverage-pyver-pragma
+deprecation:
+- deprecation
+deprecation_alias:
+- deprecation-alias
+dist_meta:
+- dist-meta
+docutils:
+- docutils
+dom_toml:
+- dom_toml
+domdf_python_tools:
+- domdf-python-tools
+exceptiongroup:
+- exceptiongroup
+first:
+- first
+flake8:
+- flake8
+handy_archives:
+- handy-archives
+hpy:
+- hpy
+idna:
+- idna
+imagesize:
+- imagesize
+importlib_metadata:
+- importlib_metadata
+importlib_resources:
+- importlib_resources
+iniconfig:
+- iniconfig
+jinja2:
+- Jinja2
+markupsafe:
+- MarkupSafe
+mccabe:
+- mccabe
+mistletoe:
+- mistletoe
+natsort:
+- natsort
+packaging:
+- packaging
+pip:
+- pip
+pkg_resources:
+- setuptools
+platformdirs:
+- platformdirs
+pluggy:
+- pluggy
+py:
+- pytest
+pycodestyle:
+- pycodestyle
+pyflakes:
+- pyflakes
+pygments:
+- Pygments
+pyparsing:
+- pyparsing
+pypi_json:
+- pypi-json
+pytest:
+- pytest
+pytest_cov:
+- pytest-cov
+pytest_datadir:
+- pytest-datadir
+pytest_randomly:
+- pytest-randomly
+pytest_regressions:
+- pytest-regressions
+pytest_rerunfailures:
+- pytest-rerunfailures
+pytest_timeout:
+- pytest-timeout
+pytz:
+- pytz
+requests:
+- requests
+setuptools:
+- setuptools
+shippinglabel:
+- shippinglabel
+snowballstemmer:
+- snowballstemmer
+sphinx:
+- Sphinx
+sphinxcontrib:
+- sphinxcontrib-applehelp
+- sphinxcontrib-devhelp
+- sphinxcontrib-htmlhelp
+- sphinxcontrib-jsmath
+- sphinxcontrib-qthelp
+- sphinxcontrib-serializinghtml
+tomli:
+- tomli
+typing_extensions:
+- typing_extensions
+urllib3:
+- urllib3
+wheel:
+- wheel
+yaml:
+- PyYAML
+zipp:
+- zipp
diff --git a/tests/test_distributions_/test_packages_distributions_3_8_pypy_.yml b/tests/test_distributions_/test_packages_distributions_3_8_pypy_.yml
new file mode 100644
index 0000000..9331f45
--- /dev/null
+++ b/tests/test_distributions_/test_packages_distributions_3_8_pypy_.yml
@@ -0,0 +1,143 @@
+_distutils_hack:
+- setuptools
+_pytest:
+- pytest
+_yaml:
+- PyYAML
+alabaster:
+- alabaster
+apeye:
+- apeye
+apeye_core:
+- apeye-core
+atomicwrites:
+- atomicwrites
+attr:
+- attrs
+attrs:
+- attrs
+babel:
+- Babel
+certifi:
+- certifi
+charset_normalizer:
+- charset-normalizer
+click:
+- click
+coincidence:
+- coincidence
+colorama:
+- colorama
+consolekit:
+- consolekit
+coverage:
+- coverage
+coverage_pyver_pragma:
+- coverage-pyver-pragma
+deprecation:
+- deprecation
+deprecation_alias:
+- deprecation-alias
+dist_meta:
+- dist-meta
+docutils:
+- docutils
+dom_toml:
+- dom_toml
+domdf_python_tools:
+- domdf-python-tools
+exceptiongroup:
+- exceptiongroup
+first:
+- first
+flake8:
+- flake8
+handy_archives:
+- handy-archives
+idna:
+- idna
+imagesize:
+- imagesize
+importlib_metadata:
+- importlib_metadata
+importlib_resources:
+- importlib_resources
+iniconfig:
+- iniconfig
+jinja2:
+- Jinja2
+markupsafe:
+- MarkupSafe
+mccabe:
+- mccabe
+mistletoe:
+- mistletoe
+natsort:
+- natsort
+packaging:
+- packaging
+pip:
+- pip
+pkg_resources:
+- setuptools
+platformdirs:
+- platformdirs
+pluggy:
+- pluggy
+py:
+- pytest
+pycodestyle:
+- pycodestyle
+pyflakes:
+- pyflakes
+pygments:
+- Pygments
+pyparsing:
+- pyparsing
+pypi_json:
+- pypi-json
+pytest:
+- pytest
+pytest_cov:
+- pytest-cov
+pytest_datadir:
+- pytest-datadir
+pytest_randomly:
+- pytest-randomly
+pytest_regressions:
+- pytest-regressions
+pytest_rerunfailures:
+- pytest-rerunfailures
+pytest_timeout:
+- pytest-timeout
+pytz:
+- pytz
+requests:
+- requests
+setuptools:
+- setuptools
+shippinglabel:
+- shippinglabel
+snowballstemmer:
+- snowballstemmer
+sphinx:
+- Sphinx
+sphinxcontrib:
+- sphinxcontrib-applehelp
+- sphinxcontrib-devhelp
+- sphinxcontrib-htmlhelp
+- sphinxcontrib-jsmath
+- sphinxcontrib-qthelp
+- sphinxcontrib-serializinghtml
+tomli:
+- tomli
+typing_extensions:
+- typing_extensions
+urllib3:
+- urllib3
+wheel:
+- wheel
+yaml:
+- PyYAML
+zipp:
+- zipp