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/python-flasgger.changes b/python-flasgger.changes
index 73c05a0..c747ce7 100644
--- a/python-flasgger.changes
+++ b/python-flasgger.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Dec 22 08:47:43 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Add multibuild for tests to avoid package build cycle.
+  flasgger -> flex (testing) -> httpbin -> flasgger
+
+-------------------------------------------------------------------
+Sun Oct 23 10:03:15 UTC 2022 - John Vandenberg <jayvdb@gmail.com>
+
+- Re-activate test suite
+- Also remove the conditional definition of python_module.
+
 -------------------------------------------------------------------
 Thu Apr 28 07:23:15 UTC 2022 - Markéta Machová <mmachova@suse.com>
 
diff --git a/python-flasgger.spec b/python-flasgger.spec
index 8324997..2e7edc2 100644
--- a/python-flasgger.spec
+++ b/python-flasgger.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package python-flasgger
+# spec file
 #
 # Copyright (c) 2022 SUSE LLC
 #
@@ -16,8 +16,16 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-flasgger
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+
+Name:           python-flasgger%{psuffix}
 Version:        0.9.5
 Release:        0
 Summary:        Tool to extract swagger specs from Flask projects
@@ -25,14 +33,6 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/rochacbruno/flasgger/
 Source:         https://files.pythonhosted.org/packages/source/f/flasgger/flasgger-%{version}.tar.gz
-#BuildRequires:  %{python_module Flask >= 0.10}
-#BuildRequires:  %{python_module PyYAML >= 3.0}
-#BuildRequires:  %{python_module flex}
-#BuildRequires:  %{python_module jsonschema >= 3.0.1}
-#BuildRequires:  %{python_module marshmallow}
-#BuildRequires:  %{python_module mistune}
-#BuildRequires:  %{python_module pytest >= 3.0.7}
-#BuildRequires:  %{python_module six >= 1.10}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -42,6 +42,21 @@ Requires:       python-jsonschema >= 3.0.1
 Requires:       python-mistune
 Requires:       python-six >= 1.10
 BuildArch:      noarch
+
+%if %{with test}
+# SECTION test requirements
+BuildRequires:  %{python_module flasgger = %{version}}
+BuildRequires:  %{python_module Flask >= 0.10}
+BuildRequires:  %{python_module PyYAML >= 3.0}
+BuildRequires:  %{python_module flex}
+BuildRequires:  %{python_module jsonschema >= 3.0.1}
+BuildRequires:  %{python_module marshmallow}
+BuildRequires:  %{python_module mistune}
+BuildRequires:  %{python_module pytest >= 3.0.7}
+BuildRequires:  %{python_module six >= 1.10}
+# /SECTION
+%endif
+
 %python_subpackages
 
 %description
@@ -50,20 +65,32 @@ Flasgger is a Flask extension to extract OpenAPI=Specification from all Flask vi
 %prep
 %setup -q -n flasgger-%{version}
 
+# Examples directory is not included in PyPI release
+rm tests/test_examples.py
+
+find . -name .DS_Store -print -delete
+
+%if !%{with test}
 %build
 %python_build
 
 %install
 %python_install
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%{python_expand chmod -x %{buildroot}%{$python_sitelib}/flasgger/ui2/static/lang/*.js
+%fdupes %{buildroot}%{$python_sitelib}
+}
+%endif
 
-# upstream testsuite is very fragile and needs packages we don't have
-#%check
-#%%pytest
+%if %{with test}
+%check
+%pytest tests/
+%endif
 
+%if !%{with test}
 %files %{python_files}
 %license LICENSE
 %doc README.md
-%{python_sitelib}/*
+%{python_sitelib}/flasgger*/
+%endif
 
 %changelog