diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 95eb61743..e40368a15 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -208,9 +208,6 @@ qt5-build_src_compile() {
 # @DESCRIPTION:
 # Runs tests in the target directories.
 qt5-build_src_test() {
-	# disable broken cmake tests (bug 474004)
-	local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake SUBDIRS-=installed_cmake)
-
 	qt5_foreach_target_subdir qt5_qmake
 	qt5_foreach_target_subdir emake
 
@@ -582,7 +579,7 @@ qt5_base_configure() {
 
 		# exclude examples and tests from default build
 		-nomake examples
-		-nomake tests
+		$(usex test '' '-nomake tests')
 		-no-compile-examples
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
@@ -650,6 +647,11 @@ qt5_base_configure() {
 		"${myconf[@]}"
 	)
 
+	if [[ -f "${S}"/tests/auto/auto.pro ]] && use test; then
+		# disable broken cmake tests (bug 474004)
+		echo 'SUBDIRS-=cmake installed_cmake' >> "${S}"/tests/auto/auto.pro || die
+	fi
+
 	pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
 	einfo "Configuring with: ${conf[@]}"