diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>
diff --git a/new-python-312.patch b/new-python-312.patch
index 4fc5185..6e5324a 100644
--- a/new-python-312.patch
+++ b/new-python-312.patch
@@ -5,16 +5,15 @@ Subject: [PATCH 1/2] fix: backward compatibility fix for changed source
  positions in 3.12.6 (#85)
 
 ---
- executing/_position_node_finder.py | 15 +++++++++++++++
- tests/generate_small_sample.py     |  9 ++++++---
- tests/test_main.py                 |  5 +++++
- 3 files changed, 26 insertions(+), 3 deletions(-)
+ executing/_position_node_finder.py                                                      |   65 ++++++++++
+ tests/generate_small_sample.py                                                          |    9 -
+ tests/small_samples/3e40f2921fbaf6ccbabb2fa5c3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py |    3 
+ tests/test_main.py                                                                      |    5 
+ 4 files changed, 79 insertions(+), 3 deletions(-)
 
-diff --git a/executing/_position_node_finder.py b/executing/_position_node_finder.py
-index 7a81415..c923822 100644
 --- a/executing/_position_node_finder.py
 +++ b/executing/_position_node_finder.py
-@@ -242,6 +242,21 @@ def fix_result(
+@@ -242,6 +242,66 @@ class PositionNodeFinder(object):
              # keeping the old behaviour makes it possible to distinguish both cases.
  
              return node.parent
@@ -33,79 +32,6 @@ index 7a81415..c923822 100644
 +            # https://github.com/python/cpython/issues/123142
 +
 +            return node.parent.parent
-         return node
- 
-     def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None:
-diff --git a/tests/generate_small_sample.py b/tests/generate_small_sample.py
-index 89c7477..573d17a 100644
---- a/tests/generate_small_sample.py
-+++ b/tests/generate_small_sample.py
-@@ -18,6 +18,7 @@
- from rich.syntax import Syntax
- from rich.console import Console
- import argparse
-+import ast
- 
- last_samples_dir = Path(__file__).parent / "last_samples"
- last_samples_dir.mkdir(exist_ok=True)
-@@ -63,6 +64,11 @@ def test_file(filename: Path):
-             delattr(Source, cache_name)
- 
-     test = TestFiles()
-+    try:
-+        ast.parse(code)
-+    except (RecursionError,SyntaxError):
-+        return True
-+
-     try:
-         with open(os.devnull, "w") as dev_null:
-             with contextlib.redirect_stderr(dev_null):
-@@ -122,9 +128,6 @@ def main():
-                     break_file.unlink()
-                     sys.exit(0)
- 
--                if time.time() > end_time:
--                    print("Timeout")
--                    sys.exit(0)
- 
-                 if not result:
-                     print(f"{filename} is failing the tests -> minimize\n")
-diff --git a/tests/test_main.py b/tests/test_main.py
-index 5d4f83b..a3f92ee 100644
---- a/tests/test_main.py
-+++ b/tests/test_main.py
-@@ -609,6 +609,11 @@ def __next__(self):
-             assert {i: i for i in iter_test(ast.DictComp)} == {1: 1, 2: 2}
-             assert list(i for i in iter_test(ast.GeneratorExp)) == [1, 2]
- 
-+            assert [i for j in [0] for i in iter_test(ast.ListComp)] == [1, 2]
-+            assert {i for j in [0] for i in iter_test(ast.SetComp)} == {1, 2}
-+            assert {i: i for j in [0] for i in iter_test(ast.DictComp)} == {1: 1, 2: 2}
-+            assert list(i for j in [0] for i in iter_test(ast.GeneratorExp)) == [1, 2]
-+
-             for i in iter_test(ast.For):
-                 assert i in (1, 2)
- 
-
-From 6a6925e691681aa5bc05b42bf1f1f06adeb25722 Mon Sep 17 00:00:00 2001
-From: Frank Hoffmann <15r10nk-git@polarbit.de>
-Date: Sun, 15 Sep 2024 14:24:10 +0200
-Subject: [PATCH 2/2] fix: handle changed positions for __exit__ of ast.With
-
----
- executing/_position_node_finder.py            | 50 +++++++++++++++++++
- ...3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py |  3 ++
- 2 files changed, 53 insertions(+)
- create mode 100644 tests/small_samples/3e40f2921fbaf6ccbabb2fa5c3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py
-
-diff --git a/executing/_position_node_finder.py b/executing/_position_node_finder.py
-index c923822..0f83441 100644
---- a/executing/_position_node_finder.py
-+++ b/executing/_position_node_finder.py
-@@ -257,6 +257,51 @@ def fix_result(
-             # https://github.com/python/cpython/issues/123142
- 
-             return node.parent.parent
 +
 +        if sys.version_info >= (3, 12,6) and instruction.opname == "CALL":
 +            before = self.instruction_before(instruction)
@@ -154,7 +80,7 @@ index c923822..0f83441 100644
          return node
  
      def known_issues(self, node: EnhancedAST, instruction: dis.Instruction) -> None:
-@@ -895,6 +940,11 @@ def node_match(node_type: Union[Type, Tuple[Type, ...]], **kwargs: Any) -> bool:
+@@ -880,6 +940,11 @@ class PositionNodeFinder(object):
      def instruction(self, index: int) -> Optional[dis.Instruction]:
          return self.bc_dict.get(index,None)
  
@@ -166,9 +92,38 @@ index c923822..0f83441 100644
      def opname(self, index: int) -> str:
          i=self.instruction(index)
          if i is None:
-diff --git a/tests/small_samples/3e40f2921fbaf6ccbabb2fa5c3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py b/tests/small_samples/3e40f2921fbaf6ccbabb2fa5c3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py
-new file mode 100644
-index 0000000..bfffc14
+--- a/tests/generate_small_sample.py
++++ b/tests/generate_small_sample.py
+@@ -18,6 +18,7 @@ from rich.progress import Progress, trac
+ from rich.syntax import Syntax
+ from rich.console import Console
+ import argparse
++import ast
+ 
+ last_samples_dir = Path(__file__).parent / "last_samples"
+ last_samples_dir.mkdir(exist_ok=True)
+@@ -64,6 +65,11 @@ def test_file(filename: Path):
+ 
+     test = TestFiles()
+     try:
++        ast.parse(code)
++    except (RecursionError,SyntaxError):
++        return True
++
++    try:
+         with open(os.devnull, "w") as dev_null:
+             with contextlib.redirect_stderr(dev_null):
+                 with contextlib.redirect_stdout(dev_null):
+@@ -122,9 +128,6 @@ def main():
+                     break_file.unlink()
+                     sys.exit(0)
+ 
+-                if time.time() > end_time:
+-                    print("Timeout")
+-                    sys.exit(0)
+ 
+                 if not result:
+                     print(f"{filename} is failing the tests -> minimize\n")
 --- /dev/null
 +++ b/tests/small_samples/3e40f2921fbaf6ccbabb2fa5c3cd3a42b54914d66f7a67f8b2ade36f89ed761b.py
 @@ -0,0 +1,3 @@
@@ -176,3 +131,17 @@ index 0000000..bfffc14
 +    async with something:
 +        pass
 \ No newline at end of file
+--- a/tests/test_main.py
++++ b/tests/test_main.py
+@@ -609,6 +609,11 @@ class TestStuff(unittest.TestCase):
+             assert {i: i for i in iter_test(ast.DictComp)} == {1: 1, 2: 2}
+             assert list(i for i in iter_test(ast.GeneratorExp)) == [1, 2]
+ 
++            assert [i for j in [0] for i in iter_test(ast.ListComp)] == [1, 2]
++            assert {i for j in [0] for i in iter_test(ast.SetComp)} == {1, 2}
++            assert {i: i for j in [0] for i in iter_test(ast.DictComp)} == {1: 1, 2: 2}
++            assert list(i for j in [0] for i in iter_test(ast.GeneratorExp)) == [1, 2]
++
+             for i in iter_test(ast.For):
+                 assert i in (1, 2)
+ 
diff --git a/python-executing.changes b/python-executing.changes
index 84edda9..2d155b4 100644
--- a/python-executing.changes
+++ b/python-executing.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 26 09:27:25 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Split test run into separate build using _multibuild.
+
+-------------------------------------------------------------------
+Fri Sep 20 20:29:20 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- The test suite has to be run with pytest, unittest is not enough
+- Add missing BuildRequires: ipython
+
 -------------------------------------------------------------------
 Wed Sep 18 06:18:15 UTC 2024 - Markéta Machová <mmachova@suse.com>
 
diff --git a/python-executing.spec b/python-executing.spec
index 8d712ed..65711eb 100644
--- a/python-executing.spec
+++ b/python-executing.spec
@@ -16,8 +16,16 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
 %{?sle15_python_module_pythons}
-Name:           python-executing
+Name:           python-executing%{psuffix}
 Version:        2.1.0
 Release:        0
 Summary:        Get the currently executing AST node of a frame, and other information
@@ -26,17 +34,21 @@ URL:            https://github.com/alexmojaki/executing
 Source:         https://files.pythonhosted.org/packages/source/e/executing/executing-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM https://github.com/alexmojaki/executing/pull/86 fix: backward compatibility fix for changed source positions in 3.12.6
 Patch0:         new-python-312.patch
-BuildRequires:  %{python_module asttokens}
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module littleutils}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools_scm >= 4.0.0}
 BuildRequires:  %{python_module toml}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
+%if %{with test}
+BuildRequires:  %{python_module asttokens}
+BuildRequires:  %{python_module ipython}
+BuildRequires:  %{python_module littleutils}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module rich}
+%endif
 %python_subpackages
 
 %description
@@ -46,19 +58,27 @@ Get the currently executing AST node of a frame, and other information
 %autosetup -p1 -n executing-%{version}
 
 %build
+%if %{without test}
 %pyproject_wheel
+%endif
 
 %install
+%if %{without test}
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %check
-%pyunittest discover -v
+%if %{with test}
+%pytest
+%endif
 
+%if %{without test}
 %files %{python_files}
 %doc README.md
 %license LICENSE.txt
 %{python_sitelib}/executing
 %{python_sitelib}/executing-%{version}.dist-info
+%endif
 
 %changelog