diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 9905a0293d4..5eee2d18f2e 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -63,6 +63,19 @@ depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2
  lame librtmp libnfs>=1.9.7 libplist>=1.12"
 depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo"
 
+# Disable this test on all architectures
+# https://github.com/void-linux/void-packages/commit/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961295/logs
+_gtest_filter="-TestCPUInfo.GetCPUFrequency"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithOlderIfModifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfModifiedSinceForcingNoCache"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithExactIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetCachedFileWithNewerIfUnmodifiedSince"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange0_First"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirst_Second"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRange_Last"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
+_gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
+
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*)
 		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
@@ -70,6 +83,13 @@ case "$XBPS_TARGET_MACHINE" in
 		makedepends+=" python3-devel ffmpeg-devel"
 		configure_args+=" -DENABLE_VAAPI=OFF"
 		;;
+	i686)
+		# Additionaly disable these tests on i686 architecutre
+		# https://github.com/void-linux/void-packages/commit/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
+		_gtest_filter+=":TestDateTime.SetFromDBTime"
+		_gtest_filter+=":TestDateTime.SetDateTime"
+		_gtest_filter+=":TestDateTime.Reset"
+		;;
 esac
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -118,6 +138,10 @@ post_build() {
 	fi
 }
 
+do_check() {
+	./build/kodi-test --gtest_filter="${_gtest_filter}"
+}
+
 kodi-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"