diff --git a/dev-libs/Ice/Ice-3.6.5-r2.ebuild b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
index 1fc1219..4a8f515 100644
--- a/dev-libs/Ice/Ice-3.6.5-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby27"
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index 9e7a8c1..c266d57 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby27"
diff --git a/dev-libs/Ice/Ice-3.7.9999.ebuild b/dev-libs/Ice/Ice-3.7.9999.ebuild
index 59d31ff..a8d8d9d 100644
--- a/dev-libs/Ice/Ice-3.7.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.7.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby27"
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
 
 PHP_EXT_OPTIONAL_USE=php
 
-USE_PHP="php7-4"
+USE_PHP="php8-0"
 
 EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
@@ -87,6 +87,13 @@ src_prepare() {
 	sed -i \
 		-e 's|"32"|""|' \
 		scripts/IceBoxUtil.py || die
+
+	if use !test; then
+		# Disable building tests
+		sed -i \
+			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
+			config/Make.rules || die
+	fi
 }
 
 src_configure() {