diff --git a/development/autotests/lyxStatus.pm b/development/autotests/lyxStatus.pm
index 99c1f6d293..699626746f 100644
--- a/development/autotests/lyxStatus.pm
+++ b/development/autotests/lyxStatus.pm
@@ -335,7 +335,7 @@ sub checkForLatexCommand($)
 	if ($param eq "bibtex") {
 	  my $rElem1 = newMatch("ext" => ".bib",
 				 "filetype" => "prefix_for_list",
-				 "search" => qr/^bibfiles\s+\"(.+)\"/,
+				 "search" => qr/^bibfiles\s+\"([^\"]+)\"/,
 				 "result" => ["bibfiles \"", "1", "\""]);
 	  my $rElem2 = newMatch("ext" => ".bst",
 				 "filetype" => "prefix_for_list",
diff --git a/development/autotests/useSystemFonts.pl b/development/autotests/useSystemFonts.pl
index 2eae022693..c3e6a80274 100644
--- a/development/autotests/useSystemFonts.pl
+++ b/development/autotests/useSystemFonts.pl
@@ -203,6 +203,10 @@ sub interpretedCopy($$$$)
 	    my $ext = $isrel[1];
 	    if ($rStatus->{"filetype"} eq "prefix_only") {
 	      $f = getNewNameOf("$sourcedir/$f", $rFiles);
+	      if ($format eq "docbook5") {
+		$rF->[1] = join(',', @{$filelist});
+		$l =  join('', @$rF);
+	      }
 	    }
 	    else {
 	      my ($newname, $res1);