diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index 69010a1..7c0c0bd 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy )
 
 RUBY_OPTIONAL="yes"
-USE_RUBY="ruby25"
+USE_RUBY="ruby26"
 
 PHP_EXT_NAME="IcePHP"
 PHP_EXT_INI="yes"
@@ -23,7 +23,7 @@ EGIT_BRANCH="3.6"
 # This variable does not belong to any eclass. It is solely used in this ebuild
 BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
 
-inherit db-use eapi7-ver mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs git-r3
+inherit db-use mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs git-r3
 
 # for mono-env
 unset SRC_URI
@@ -106,15 +106,21 @@ src_prepare() {
 	# skip IceGrid/admin bug #649850
 	# skip IceSSL tests due to requirement of internet connection
 	# skip IceStorm/single bug #636834
-	# IceUtil/stacktrace fails with USE=debug
+	# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
+	# Glacier2/staticFiltering requires network access
 	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceUtil\/stacktrace|' \
+		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
 		cpp/Makefile || die "sed failed"
 
-	# mainly broken .ice files
+	# fails even on unicode locale
 	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
-		python/Makefile || die "sed failed"
+		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
+		ruby/Makefile || die "sed failed"
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/TestUtil.py || die "sed failed"
 }
 
 src_configure() {
diff --git a/dev-libs/Ice/Ice-3.7.9999.ebuild b/dev-libs/Ice/Ice-3.7.9999.ebuild
index 8f03a31..edd0505 100644
--- a/dev-libs/Ice/Ice-3.7.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.7.9999.ebuild
@@ -29,6 +29,7 @@ SLOT="0/37"
 KEYWORDS=""
 # XXX: readline
 IUSE="debug examples libressl php python ruby test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
@@ -37,7 +38,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	dev-db/lmdb
 	dev-cpp/libmcpp
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby23) )"
+	ruby? ( $(ruby_implementation_depend ruby26) )"
 DEPEND="${RDEPEND}
 	test? (
 		${PYTHON_DEPS}
@@ -165,7 +166,6 @@ run_tests() {
 	return ${ret}
 }
 
-
 src_test() {
 	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
 	run_tests cpp || die "emake cpp test failed"