diff --git a/fix_i586_test.patch b/fix_i586_test.patch
new file mode 100644
index 0000000..d828497
--- /dev/null
+++ b/fix_i586_test.patch
@@ -0,0 +1,27 @@
+---
+ 3rd/bee.lua/test/test_platform.lua             |    2 ++
+ 3rd/luamake/3rd/bee.lua/test/test_platform.lua |    2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/3rd/bee.lua/test/test_platform.lua
++++ b/3rd/bee.lua/test/test_platform.lua
+@@ -43,6 +43,8 @@ function test_plat:test_1()
+     if plat == 'linux' then
+         lu.assertEquals(platform.Compiler == 'gcc' or platform.Compiler == 'clang', true)
+         support.linux.Compiler = platform.Compiler
++        -- There are too many platforms Linux run on
++        support[plat].Arch = platform.Arch
+     end
+     if plat == 'msvc' or plat == 'msbuild' then
+         lu.assertEquals(platform.Arch == 'x86' or platform.Arch == 'x86_64', true)
+--- a/3rd/luamake/3rd/bee.lua/test/test_platform.lua
++++ b/3rd/luamake/3rd/bee.lua/test/test_platform.lua
+@@ -43,6 +43,8 @@ function test_plat:test_1()
+     if plat == 'linux' then
+         lu.assertEquals(platform.Compiler == 'gcc' or platform.Compiler == 'clang', true)
+         support.linux.Compiler = platform.Compiler
++        -- There are too many platforms Linux run on
++        support[plat].Arch = platform.Arch
+     end
+     if plat == 'msvc' or plat == 'msbuild' then
+         lu.assertEquals(platform.Arch == 'x86' or platform.Arch == 'x86_64', true)
diff --git a/lua-language-server.changes b/lua-language-server.changes
index 0703c9d..86c04bf 100644
--- a/lua-language-server.changes
+++ b/lua-language-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 16 18:15:52 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Add fix_i586_test.patch to switch off testing architecture in bee.lua
+
 -------------------------------------------------------------------
 Fri Jul 16 12:26:44 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>
 
diff --git a/lua-language-server.spec b/lua-language-server.spec
index 685bdb9..65c51ef 100644
--- a/lua-language-server.spec
+++ b/lua-language-server.spec
@@ -26,6 +26,9 @@ Url:            https://github.com/sumneko/lua-language-server
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        lua-lsp-launcher.sh
 Source2:        README.suse-maint.md
+# PATCH-FIX-UPSTREAM fix_i586_test.patch bsc#[0-9]+ mcepl@suse.com
+# It doesn't make sense to limit platforms where Linux could run.
+Patch0:         fix_i586_test.patch
 BuildRequires:  gcc-c++
 BuildRequires:  ninja
 BuildRequires:  fdupes