diff --git a/guide/mu/guide.dtx b/guide/mu/guide.dtx
index bb8ac920af86453b8b77398d0af6387e5da793a2..d78a42c128fa96b879e72d170fba0cb215eb636b 100644
--- a/guide/mu/guide.dtx
+++ b/guide/mu/guide.dtx
@@ -1022,7 +1022,5 @@
   case-by-case basis.
 
   \makeatletter\thesis@postamble\makeatother
-  \tolerance=300\emergencystretch=1em
-  \printbibliography[heading=bibintoc]
 \end{document}
 %    \end{macrocode}
diff --git a/style/mu/base.dtx b/style/mu/base.dtx
index ed82274a0ebc6b7a9e681540b49dd84332df953e..3e31e2a0e1a6afe0c4d1259efc38238f43613974 100644
--- a/style/mu/base.dtx
+++ b/style/mu/base.dtx
@@ -434,7 +434,7 @@
       \thesis@bibliography@included@false
       \let\thesis@printbibliography@old\printbibliography
       \def\printbibliography{%
-        \thesis@bibliography@included@true
+        \global\thesis@bibliography@included@true
         \thesis@printbibliography@old}
     \fi
   \fi}
diff --git a/test/mu/compare/Makefile b/test/mu/compare/Makefile
index 9676ddf3eb17356e99d0ea417a72c229c2ef2da1..f3cce5e26c3aeb858c636d55869d609fe2807f90 100644
--- a/test/mu/compare/Makefile
+++ b/test/mu/compare/Makefile
@@ -26,7 +26,8 @@ SOURCES=base-digital.tex base-printed.tex base-10pt.tex \
 	toc-11.tex toc-12.tex toc-13.tex toc-14.tex toc-15.tex \
 	toc-16.tex toc-17.tex toc-18.tex toc-19.tex toc-20.tex \
 	toc-21.tex toc-22.tex toc-23.tex toc-24.tex toc-25.tex \
-	toc-26.tex toc-27.tex toc-28.tex
+	toc-26.tex toc-27.tex toc-28.tex fi-bibliography-solicited.tex \
+	fi-bibliography-unsolicited.tex
 TESTS=$(addsuffix -pdflatex.pdf,$(basename $(SOURCES))) \
 	$(addsuffix -lualatex.pdf,$(basename $(SOURCES)))
 PROTOTYPES=$(addprefix expected-,$(TESTS))
@@ -57,11 +58,13 @@ expected-%-lualatex.pdf: %.tex
 	@# The first run.
 	$(FAKETIME) pdflatex -jobname          $(basename $@) $<
 	@# Prepare bibliography, if necessary.
-	! [ -e $(basename $<).bcf ] || (biber  $(basename $<).bcf && \
+	! [ -e $(basename $<)-pdflatex.bcf ] || \
+		(biber  $(basename $<)-pdflatex.bcf && \
 	$(FAKETIME) pdflatex -jobname          $(basename $@) $<)
 	@# Prepare index, if necessary.
-	! [ -e $(basename $<).idx ] || \
-		(texindy -I latex -C utf8 -L english $(basename $<).idx && \
+	! [ -e $(basename $<)-pdflatex.idx ] || \
+		(texindy -I latex -C utf8 -L english \
+		$(basename $<)-pdflatex.idx && \
 	$(FAKETIME) pdflatex -jobname          $(basename $@) $<)
 	@# The second run.
 	$(FAKETIME) pdflatex -jobname          $(basename $@) $<
@@ -75,11 +78,13 @@ expected-%-lualatex.pdf: %.tex
 	@# The first run.
 	$(FAKETIME) lualatex -jobname          $(basename $@) $<
 	@# Prepare bibliography, if necessary.
-	! [ -e $(basename $<).bcf ] || (biber  $(basename $<).bcf && \
+	! [ -e $(basename $<)-lualatex.bcf ] || \
+		(biber  $(basename $<)-lualatex.bcf && \
 	$(FAKETIME) lualatex -jobname          $(basename $@) $<)
 	@# Prepare index, if necessary.
-	! [ -e $(basename $<).idx ] || \
-		(texindy -I latex -C utf8 -L english $(basename $<).idx && \
+	! [ -e $(basename $<)-lualatex.idx ] || \
+		(texindy -I latex -C utf8 -L english \
+		$(basename $<)-lualatex.idx && \
 	$(FAKETIME) lualatex -jobname          $(basename $@) $<)
 	@# The second run.
 	$(FAKETIME) lualatex -jobname          $(basename $@) $<
diff --git a/test/mu/compare/fi-bibliography-solicited.tex b/test/mu/compare/fi-bibliography-solicited.tex
new file mode 100644
index 0000000000000000000000000000000000000000..62e2e93bc1a5f18b191f3b4a8d42fa831be419b7
--- /dev/null
+++ b/test/mu/compare/fi-bibliography-solicited.tex
@@ -0,0 +1,8 @@
+\documentclass{fithesis3}
+\thesissetup{
+  bib=../../../example/mu/example.bib}
+\begin{document}
+  Foo bar
+  \nocite{*}
+  {\printbibliography[heading=bibintoc]}
+\end{document}
diff --git a/test/mu/compare/fi-bibliography-unsolicited.tex b/test/mu/compare/fi-bibliography-unsolicited.tex
new file mode 100644
index 0000000000000000000000000000000000000000..e0c253c99b37eff340a1e1f8ec07093367d59947
--- /dev/null
+++ b/test/mu/compare/fi-bibliography-unsolicited.tex
@@ -0,0 +1,7 @@
+\documentclass{fithesis3}
+\thesissetup{
+  bib=../../../example/mu/example.bib}
+\begin{document}
+  Foo bar
+  \nocite{*}
+\end{document}
diff --git a/test/mu/comparepdf.sh b/test/mu/comparepdf.sh
index f27e92577f83f67344f800d82601854631e2b99e..e30ec13fefacccc059701c2302b670e8dc0c99b1 100755
--- a/test/mu/comparepdf.sh
+++ b/test/mu/comparepdf.sh
@@ -26,14 +26,15 @@ DEST_DIR=`mktemp -d` && trap 'rm -r $SOURCE_DIR $DEST_DIR' EXIT &&
 # Compare the individual pages.
 DIFFER=false; PAGES=""
 for PAGE in `((cd $SOURCE_DIR && ls *.pdf) && (cd $DEST_DIR && ls *.pdf)) | sort -u`; do
+  PAGENUM=`echo ${PAGE%%.pdf} | sed 's/^0*//'`
   if [ -e $SOURCE_DIR/$PAGE -a ! -e $DEST_DIR/$PAGE ]; then
-    die 'The document "%s" does not contain page "%d".' "$1" "${PAGE%%.pdf}"
+    die 'The document "%s" does not contain page "%d".' "$2" $PAGENUM
   elif [ ! -e $SOURCE_DIR/$PAGE -a -e $DEST_DIR/$PAGE ]; then
-    die 'The document "%s" does not contain page "%d".' "$2" "${PAGE%%.pdf}"
+    die 'The document "%s" does not contain page "%d".' "$1" $PAGENUM
   else
     if ! comparepdf --compare=appearance --verbose=0 $SOURCE_DIR/$PAGE $DEST_DIR/$PAGE; then
       DIFFER=true
-      PAGES="$PAGES, `echo ${PAGE%%.pdf} | sed 's/^0*//'`"
+      PAGES="$PAGES, $PAGENUM"
     fi
   fi    
 done