diff --git a/test/all.bib b/test/input/all.bib
similarity index 100%
rename from test/all.bib
rename to test/input/all.bib
diff --git a/test/bibacid-iso8859.bib b/test/input/bibacid-iso8859.bib
similarity index 100%
rename from test/bibacid-iso8859.bib
rename to test/input/bibacid-iso8859.bib
diff --git a/test/entries.bib b/test/input/entries.bib
similarity index 100%
rename from test/entries.bib
rename to test/input/entries.bib
diff --git a/test/metrics.bib b/test/input/metrics.bib
similarity index 100%
rename from test/metrics.bib
rename to test/input/metrics.bib
diff --git a/test/strings.bib b/test/input/strings.bib
similarity index 100%
rename from test/strings.bib
rename to test/input/strings.bib
diff --git a/test/all.bib.txt b/test/output/all.bib.txt
similarity index 100%
rename from test/all.bib.txt
rename to test/output/all.bib.txt
diff --git a/test/bibacid-iso8859.bib.txt b/test/output/bibacid-iso8859.bib.txt
similarity index 100%
rename from test/bibacid-iso8859.bib.txt
rename to test/output/bibacid-iso8859.bib.txt
diff --git a/test/metrics.bib.txt b/test/output/metrics.bib.txt
similarity index 100%
rename from test/metrics.bib.txt
rename to test/output/metrics.bib.txt
diff --git a/test/strings.bib;entries.bib.txt b/test/output/strings.bib;entries.bib.txt
similarity index 100%
rename from test/strings.bib;entries.bib.txt
rename to test/output/strings.bib;entries.bib.txt
diff --git a/test/update-test-data.php b/test/update-test-data.php
index 3af983f..ee70a4c 100755
--- a/test/update-test-data.php
+++ b/test/update-test-data.php
@@ -6,20 +6,24 @@ then a bzr diff is the regression test
 
 */
 $_GET['test']=1;
-include('../bibtexbrowser.php');
+include(dirname(__FILE__).'/../bibtexbrowser.php');
 
 $testbibs = array (
-  'bibacid-iso8859.bib',
-  'all.bib',
-  'metrics.bib',
-  'strings.bib;entries.bib'
+  dirname(__FILE__).'/input/bibacid-iso8859.bib',
+  dirname(__FILE__).'/input/all.bib',
+  dirname(__FILE__).'/input/metrics.bib',
+  dirname(__FILE__).'/input/strings.bib;'.dirname(__FILE__).'/input/entries.bib'
 );
 
 foreach ($testbibs as $k) {
+  echo $k."\n";
   $db = new BibDataBase();
+  $output = array();
   foreach(explode(MULTIPLE_BIB_SEPARATOR,$k) as $bibfile) {
     $db->load($bibfile);
+    $output[] = basename($bibfile);
   }
+  $output = implode(';', $output).'.txt';
 
   // sorting the entries
   ksort($db->bibdb);
@@ -34,7 +38,7 @@ foreach ($testbibs as $k) {
     $result .= var_export($bib->fields, true)."\n";
   }
   //echo $result;
-  file_put_contents($k.'.txt',$result);
+  file_put_contents(dirname(__FILE__).'/output/'.$output,$result);
 }
 
 ?>
\ No newline at end of file