diff --git a/dev-libs/Ice/Ice-3.6.1.ebuild b/dev-libs/Ice/Ice-3.6.1.ebuild
index 3f5c7eb..9d1af9f 100644
--- a/dev-libs/Ice/Ice-3.6.1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.1.ebuild
@@ -95,6 +95,11 @@ src_prepare() {
 		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
 		csharp/config/Make.rules.cs || die "sed failed"
 
+	# skip mono tests, bug #498484
+	sed -i \
+		-e 's|^\(SUBDIRS.*\)test|\1|' \
+		csharp/Makefile || die "sed failed"
+
 	if ! use test ; then
 		sed -i \
 			-e 's|^\(SUBDIRS.*\)test|\1|' \
@@ -150,10 +155,12 @@ src_configure() {
 	fi
 
 	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)"
-
+	if has_version ">dev-lang/mono-4"; then
+		MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs"
+	fi
 	MAKE_RULES_PHP="USE_NAMESPACES=yes"
 
-	use test && python_export_best
+	use test && python_setup
 }
 
 src_compile() {
@@ -280,6 +287,8 @@ src_test() {
 	fi
 
 	if use mono ; then
-		run_tests csharp || die "emake csharp test failed"
+		# skip mono tests, bug #498484
+		ewarn "Tests for C# are currently disabled."
+#		run_tests csharp || die "emake csharp test failed"
 	fi
 }