2 files changed, 6 insertions, 9 deletions

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 814613f9c23f..e9081145960e 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -108,6 +108,7 @@ __DEFAULT_YES_OPTIONS = \
     GDB \
     GNU_DIFF \
     GNU_GREP \
+    GOOGLETEST \
     GPIO \
     HAST \
     HTML \
@@ -265,15 +266,6 @@ __TT=${TARGET}
 __TT=${MACHINE}
 .endif
 
-# Default GOOGLETEST to off for MIPS while LLVM PR 43263 is active.  Part
-# of the fusefs tests trigger excessively long compile times.  It does
-# eventually succeed, but this shouldn't be forced on those building by default.
-.if ${__TT} == "mips"
-__DEFAULT_NO_OPTIONS+=	GOOGLETEST
-.else
-__DEFAULT_YES_OPTIONS+=	GOOGLETEST
-.endif
-
 # All supported backends for LLVM_TARGET_XXX
 __LLVM_TARGETS= \
 		aarch64 \
diff --git a/tests/sys/fs/Makefile b/tests/sys/fs/Makefile
index 6769f2182e79..a117854ec00d 100644
--- a/tests/sys/fs/Makefile
+++ b/tests/sys/fs/Makefile
@@ -12,8 +12,13 @@ TESTSRC=		${SRCTOP}/contrib/netbsd-tests/fs
 #TESTS_SUBDIRS+=	nullfs	# XXX: needs rump
 # fusefs tests cannot be compiled/used without the googletest infrastructure.
 .if ${COMPILER_FEATURES:Mc++14} && ${MK_GOOGLETEST} != "no"
+# Don't build fusefs tests for MIPS while LLVM PR 43263 is active, as part
+# of the fusefs tests trigger excessively long compile time.  The build does
+# eventually succeed, but it's perhaps better to not do so by default for now.
+.if ${MACHINE_CPUARCH} != "mips" || ${COMPILER_TYPE} != "clang"
 TESTS_SUBDIRS+=		fusefs
 .endif
+.endif
 TESTS_SUBDIRS+=		tmpfs
 
 ${PACKAGE}FILES+=	h_funcs.subr