diff --git a/macros.python3 b/macros.python3
index 480da96..6b19117 100644
--- a/macros.python3
+++ b/macros.python3
@@ -86,4 +86,5 @@
   PATH="%{buildroot}%{_bindir}:$PATH"\\\
   PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\
   PYTHONDONTWRITEBYTECODE=1\\\
+  %{?__pytest_addopts:PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} %{__pytest_addopts}"}\\\
   %__pytest}
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index 04fe84c..7f1aa0f 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -31,7 +31,7 @@ elseif posix.stat('macros.python-srpm') then
 end
 }
 Version:        %{__default_python3_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 BuildArch:      noarch
 
@@ -109,6 +109,10 @@ install -m 644 compileall2.py %{buildroot}%{_rpmconfigdir}/redhat/
 
 
 %changelog
+* Mon Jun 28 2021 Miro Hrončok <mhroncok@redhat.com> - 3.10-3
+- %%pytest: Set $PYTEST_ADDOPTS when %%{__pytest_addopts} is defined
+- Related: rhzb#1935212
+
 * Tue Jun 15 2021 Miro Hrončok <mhroncok@redhat.com> - 3.10-2
 - Fix %%python_provide when fed python3.10-foo to obsolete python-foo instead of python--foo
 
diff --git a/tests/test_evals.py b/tests/test_evals.py
index 43216ca..4a15091 100644
--- a/tests/test_evals.py
+++ b/tests/test_evals.py
@@ -211,6 +211,39 @@ def test_pytest_command_suffix():
     assert '/usr/bin/pytest-3.6 -v' in lines[-1]
 
 
+def test_pytest_undefined_addopts_are_not_set():
+    lines = rpm_eval('%pytest', __pytest_addopts=None)
+    assert 'PYTEST_ADDOPTS' not in '\n'.join(lines)
+
+
+def test_pytest_defined_addopts_are_set():
+    lines = rpm_eval('%pytest', __pytest_addopts="--ignore=stuff")
+    assert 'PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} --ignore=stuff"' in '\n'.join(lines)
+
+
+@pytest.mark.parametrize('__pytest_addopts', ['--macronized-option', 'x y z', None])
+def test_pytest_addopts_preserves_envvar(__pytest_addopts):
+    # this is the line a packager might put in the spec file before running %pytest:
+    spec_line = 'export PYTEST_ADDOPTS="--exported-option1 --exported-option2"'
+
+    # instead of actually running /usr/bin/pytest,
+    # we run a small shell script that echoes the tested value for inspection
+    lines = rpm_eval('%pytest', __pytest_addopts=__pytest_addopts,
+                     __pytest="sh -c 'echo $PYTEST_ADDOPTS'")
+
+    echoed = shell_stdout('\n'.join([spec_line] + lines))
+
+    # assert all values were echoed
+    assert '--exported-option1' in echoed
+    assert '--exported-option2' in echoed
+    if __pytest_addopts is not None:
+        assert __pytest_addopts in echoed
+
+    # assert the options are separated
+    assert 'option--' not in echoed
+    assert 'z--' not in echoed
+
+
 def test_pypi_source_default_name():
     urls = rpm_eval('%pypi_source',
                     name='foo', version='6')