diff --git a/Makefile.am b/Makefile.am
index 488d4b6d..e49b7c59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,9 @@ include Makefile-otutil.am
 include Makefile-libostree.am
 include Makefile-ostree.am
 include Makefile-switchroot.am
+if BUILDOPT_FUSE
 include src/rofiles-fuse/Makefile-inc.am
+endif
 include Makefile-tests.am
 include Makefile-boot.am
 include Makefile-man.am
diff --git a/configure.ac b/configure.ac
index dca9f536..6af60e8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,7 @@ AC_ARG_ENABLE(rofiles-fuse,
               [AS_HELP_STRING([--enable-rofiles-fuse],
                               [generate rofiles-fuse helper [default=yes]])],,
               enable_rofiles_fuse=yes)
-AS_IF([ test $enable_rofiles_fuse != xno ], [
+AS_IF([ test x$enable_rofiles_fuse != xno ], [
     PKG_CHECK_MODULES(BUILDOPT_FUSE, $FUSE_DEPENDENCY)
 ], [enable_rofiles_fuse=no])
 AM_CONDITIONAL(BUILDOPT_FUSE, test x$enable_rofiles_fuse = xyes)