diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
index b7d9a70..0e892f7 100644
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples libressl +ncurses mono php php_namespaces python ruby test debug"
+IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
@@ -41,7 +41,6 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	ruby? ( $(ruby_implementation_depend ruby22) )
 	mono? ( dev-lang/mono )
 	php? ( dev-lang/php:7.0 )
-	php_namespaces? ( dev-lang/php:7.0 )
 	!dev-python/IcePy
 	!dev-ruby/IceRuby"
 DEPEND="${RDEPEND}
@@ -51,8 +50,6 @@ DEPEND="${RDEPEND}
 		dev-python/passlib[${PYTHON_USEDEP}]
 	)"
 
-REQUIRED_USE="php_namespaces? ( php )"
-
 # Maintainer notes:
 # TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
 
@@ -108,7 +105,7 @@ src_prepare() {
 	# skip IceSSL tests due to requirement of internet connection
 	# IceStorm/stress fails without USE=debug
 	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
+		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
 		cpp/Makefile || die "sed failed"
 
 	# mainly broken .ice files
@@ -208,10 +205,7 @@ src_compile() {
 			ln -s "${S}/slice"
 			ln -s "${S}/Makefile"
 
-			if use php_namespaces ; then
-				MAKE_RULES_PHP="USE_NAMESPACES=yes"
-			fi
-			emake -C php ${MAKE_RULES} ${MAKE_RULES_PHP} PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed" 
+			emake -C php ${MAKE_RULES} USE_NAMESPACES=yes PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed" 
 		done
 		cd "${S}"
 	fi
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index b1c8ce0..e90366f 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="http://www.zeroc.com/"
 LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS=""
-IUSE="examples libressl +ncurses mono php php_namespaces python ruby test debug"
+IUSE="examples libressl +ncurses mono php python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1
 	>=app-arch/bzip2-1.0.5
@@ -46,7 +46,6 @@ RDEPEND=">=dev-libs/expat-2.0.1
 	ruby? ( $(ruby_implementation_depend ruby23) )
 	mono? ( dev-lang/mono )
 	php? ( dev-lang/php:7.0 )
-	php_namespaces? ( dev-lang/php:7.0 )
 	!dev-python/IcePy
 	!dev-ruby/IceRuby"
 DEPEND="${RDEPEND}
@@ -56,8 +55,6 @@ DEPEND="${RDEPEND}
 		dev-python/passlib[${PYTHON_USEDEP}]
 	)"
 
-REQUIRED_USE="php_namespaces? ( php )"
-
 # Maintainer notes:
 # TODO: java bindings
 
@@ -113,7 +110,7 @@ src_prepare() {
 	# skip IceSSL tests due to requirement of internet connection
 	# IceStorm/stress fails without USE=debug
 	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
+		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
 		cpp/Makefile || die "sed failed"
 
 	# mainly broken .ice files
@@ -213,10 +210,7 @@ src_compile() {
 			ln -s "${S}/slice"
 			ln -s "${S}/Makefile"
 
-			if use php_namespaces ; then
-				MAKE_RULES_PHP="USE_NAMESPACES=yes"
-			fi
-			emake -C php ${MAKE_RULES} ${MAKE_RULES_PHP} PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed" 
+			emake -C php ${MAKE_RULES} USE_NAMESPACES=yes PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed"
 		done
 		cd "${S}"
 	fi