diff --git a/kicad.spec b/kicad.spec
index d25a26e..8815d1d 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -83,6 +83,31 @@ KiCad includes a project manager and four main independent software tools:
 
 %lang_package
 
+# Per lang split packages from old kicad-i18n
+Conflicts:      kicad-lang-bg < 6.0.0
+Conflicts:      kicad-lang-ca < 6.0.0
+Conflicts:      kicad-lang-cs < 6.0.0
+Conflicts:      kicad-lang-de < 6.0.0
+Conflicts:      kicad-lang-el < 6.0.0
+Conflicts:      kicad-lang-en < 6.0.0
+Conflicts:      kicad-lang-es < 6.0.0
+Conflicts:      kicad-lang-fi < 6.0.0
+Conflicts:      kicad-lang-fr < 6.0.0
+Conflicts:      kicad-lang-hu < 6.0.0
+Conflicts:      kicad-lang-it < 6.0.0
+Conflicts:      kicad-lang-ja < 6.0.0
+Conflicts:      kicad-lang-ko < 6.0.0
+Conflicts:      kicad-lang-lt < 6.0.0
+Conflicts:      kicad-lang-nl < 6.0.0
+Conflicts:      kicad-lang-pl < 6.0.0
+Conflicts:      kicad-lang-pt < 6.0.0
+Conflicts:      kicad-lang-ru < 6.0.0
+Conflicts:      kicad-lang-sk < 6.0.0
+Conflicts:      kicad-lang-sl < 6.0.0
+Conflicts:      kicad-lang-sv < 6.0.0
+Conflicts:      kicad-lang-zh_CN < 6.0.0
+Conflicts:      kicad-lang-zh_TW < 6.0.0
+
 %prep
 %autosetup -p1 -n kicad-%{file_version}
 
@@ -139,7 +164,12 @@ cmp %{buildroot}%{_bindir}/_pcbnew.kiface %{buildroot}%{python3_sitearch}/_pcbne
 %find_lang %{name}
 
 %check
+%ifarch %{ix86}
+# https://gitlab.com/kicad/code/kicad/-/issues/10149
+%ctest --exclude-regex qa_eeschema
+%else
 %ctest
+%endif
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig