--- virtualx.eclass
+++ virtualx.eclass
@@ -144,7 +144,7 @@
 		# Do not break on error, but setup $retval, as we need
 		# to kill Xvfb
 		debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
-		${VIRTUALX_COMMAND} "$@"
+		nonfatal ${VIRTUALX_COMMAND} "$@"
 		retval=$?
 
 		# Now kill Xvfb

--- cmake-utils.eclass
+++ cmake-utils.eclass
@@ -442,6 +442,8 @@
 
 	if ctest ${ctestargs} "$@" ; then
 		einfo "Tests succeeded."
+		popd > /dev/null
+		return 0
 	else
 		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
 			# on request from Diego
@@ -453,8 +455,11 @@
 		else
 			die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log"
 		fi
+
+		# die might not die due to nonfatal
+		popd > /dev/null
+		return 1
 	fi
-	popd > /dev/null
 }
 
 # @FUNCTION: cmake-utils_src_configure