From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Tue, 20 Aug 2013 05:58:27 +0000 (+0000)
Subject: tests/base: Correct output
X-Git-Tag: v8.1.0~570^2~459
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5c31d2211203e0f6401a81ab50494ac4f65ee4;p=dealii.git

tests/base: Correct output

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30351 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/tests/base/anisotropic_2.cc b/tests/base/anisotropic_2.cc
index 500d013455..ec552df3c2 100644
--- a/tests/base/anisotropic_2.cc
+++ b/tests/base/anisotropic_2.cc
@@ -158,7 +158,7 @@ void check ()
 
 int main()
 {
-  std::ofstream logfile("anisotropic_2/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(2);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/auto_derivative_function.cc b/tests/base/auto_derivative_function.cc
index af85ba30dd..3628893b33 100644
--- a/tests/base/auto_derivative_function.cc
+++ b/tests/base/auto_derivative_function.cc
@@ -121,7 +121,7 @@ void ExactSinExp<dim>::vector_gradient (const Point<dim>       &p,
 
 int main()
 {
-  std::ofstream logfile("auto_derivative_function/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(4);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/conditional_ostream.cc b/tests/base/conditional_ostream.cc
index 6e12f63f37..c44da50160 100644
--- a/tests/base/conditional_ostream.cc
+++ b/tests/base/conditional_ostream.cc
@@ -28,7 +28,7 @@
 
 int main()
 {
-  std::ofstream logfile("conditional_ostream/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/convergence_table_01.cc b/tests/base/convergence_table_01.cc
index a736b3bde6..bf1ed5511c 100644
--- a/tests/base/convergence_table_01.cc
+++ b/tests/base/convergence_table_01.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("convergence_table_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/convergence_table_02.cc b/tests/base/convergence_table_02.cc
index f2dad06233..1226a34a14 100644
--- a/tests/base/convergence_table_02.cc
+++ b/tests/base/convergence_table_02.cc
@@ -30,7 +30,7 @@
 
 int main ()
 {
-  std::ofstream logfile("convergence_table_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/convergence_table_03.cc b/tests/base/convergence_table_03.cc
index 71a775928a..65bed65f93 100644
--- a/tests/base/convergence_table_03.cc
+++ b/tests/base/convergence_table_03.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("convergence_table_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/convergence_table_04.cc b/tests/base/convergence_table_04.cc
index 31666ca791..de4cea230d 100644
--- a/tests/base/convergence_table_04.cc
+++ b/tests/base/convergence_table_04.cc
@@ -35,7 +35,7 @@
 
 int main ()
 {
-  std::ofstream logfile("convergence_table_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/data_out_base.cc b/tests/base/data_out_base.cc
index e31b508051..4265f40dc5 100644
--- a/tests/base/data_out_base.cc
+++ b/tests/base/data_out_base.cc
@@ -210,7 +210,7 @@ void test(std::ostream &out)
 
 int main()
 {
-  std::ofstream logfile("data_out_base/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/data_out_base_dx.cc b/tests/base/data_out_base_dx.cc
index 59e4c20d05..715469b10f 100644
--- a/tests/base/data_out_base_dx.cc
+++ b/tests/base/data_out_base_dx.cc
@@ -164,7 +164,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_dx/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_eps.cc b/tests/base/data_out_base_eps.cc
index c993d53a9e..ccef533fa0 100644
--- a/tests/base/data_out_base_eps.cc
+++ b/tests/base/data_out_base_eps.cc
@@ -115,7 +115,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_eps/output");
+  std::ofstream logfile("output");
 //  check_all<1,1>(logfile);
 //  check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_gmv.cc b/tests/base/data_out_base_gmv.cc
index 7c67694ad6..14e138fc4d 100644
--- a/tests/base/data_out_base_gmv.cc
+++ b/tests/base/data_out_base_gmv.cc
@@ -79,7 +79,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_gmv/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_gnuplot.cc b/tests/base/data_out_base_gnuplot.cc
index 849c8d5cc2..c1d67ccdf6 100644
--- a/tests/base/data_out_base_gnuplot.cc
+++ b/tests/base/data_out_base_gnuplot.cc
@@ -79,7 +79,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_gnuplot/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_povray.cc b/tests/base/data_out_base_povray.cc
index 1eb125d2ed..defa6761d7 100644
--- a/tests/base/data_out_base_povray.cc
+++ b/tests/base/data_out_base_povray.cc
@@ -141,7 +141,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_povray/output");
+  std::ofstream logfile("output");
 //  check_all<1,1>(logfile);
 //  check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_pvd.cc b/tests/base/data_out_base_pvd.cc
index 2a9d144a67..6221457a1c 100644
--- a/tests/base/data_out_base_pvd.cc
+++ b/tests/base/data_out_base_pvd.cc
@@ -70,6 +70,6 @@ void check(std::ostream &out)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_pvd/output");
+  std::ofstream logfile("output");
   check<2,2>(logfile);
 }
diff --git a/tests/base/data_out_base_pvtu.cc b/tests/base/data_out_base_pvtu.cc
index 4715dbe084..e1c964cd67 100644
--- a/tests/base/data_out_base_pvtu.cc
+++ b/tests/base/data_out_base_pvtu.cc
@@ -73,6 +73,6 @@ void check(std::ostream &out)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_pvtu/output");
+  std::ofstream logfile("output");
   check<2,2>(logfile);
 }
diff --git a/tests/base/data_out_base_tecplot.cc b/tests/base/data_out_base_tecplot.cc
index 7294d43b2d..d6cd2cd5b1 100644
--- a/tests/base/data_out_base_tecplot.cc
+++ b/tests/base/data_out_base_tecplot.cc
@@ -79,7 +79,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_tecplot/output",
+  std::ofstream logfile("output",
                         std::ios_base::trunc | std::ios_base::binary);
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
diff --git a/tests/base/data_out_base_tecplot_bin.cc b/tests/base/data_out_base_tecplot_bin.cc
index 5825318924..42b0aa917e 100644
--- a/tests/base/data_out_base_tecplot_bin.cc
+++ b/tests/base/data_out_base_tecplot_bin.cc
@@ -67,7 +67,7 @@ void check_all()
 
 int main()
 {
-  std::ofstream logfile("data_out_base_tecplot_bin/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   check_all<1,1>();
diff --git a/tests/base/data_out_base_vtk.cc b/tests/base/data_out_base_vtk.cc
index 5845cc6ae9..6616bc3d20 100644
--- a/tests/base/data_out_base_vtk.cc
+++ b/tests/base/data_out_base_vtk.cc
@@ -79,7 +79,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtk/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_vtk_cycle.cc b/tests/base/data_out_base_vtk_cycle.cc
index bdca62d055..aa3ff43291 100644
--- a/tests/base/data_out_base_vtk_cycle.cc
+++ b/tests/base/data_out_base_vtk_cycle.cc
@@ -85,7 +85,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtk_cycle/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_vtk_time.cc b/tests/base/data_out_base_vtk_time.cc
index 7f42523a59..c44741c7db 100644
--- a/tests/base/data_out_base_vtk_time.cc
+++ b/tests/base/data_out_base_vtk_time.cc
@@ -85,7 +85,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtk_time/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_vtk_time_and_cycle.cc b/tests/base/data_out_base_vtk_time_and_cycle.cc
index 7a9f0fbba1..d9d77ecc3c 100644
--- a/tests/base/data_out_base_vtk_time_and_cycle.cc
+++ b/tests/base/data_out_base_vtk_time_and_cycle.cc
@@ -86,7 +86,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtk_time_and_cycle/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_vtu.cc b/tests/base/data_out_base_vtu.cc
index 030df7bb9f..ce203c4c93 100644
--- a/tests/base/data_out_base_vtu.cc
+++ b/tests/base/data_out_base_vtu.cc
@@ -79,7 +79,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtu/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_vtu_cycle.cc b/tests/base/data_out_base_vtu_cycle.cc
index 8c5b24cbfd..6106204ee7 100644
--- a/tests/base/data_out_base_vtu_cycle.cc
+++ b/tests/base/data_out_base_vtu_cycle.cc
@@ -84,7 +84,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtu_cycle/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_vtu_time.cc b/tests/base/data_out_base_vtu_time.cc
index 48615e6ce6..24ac715959 100644
--- a/tests/base/data_out_base_vtu_time.cc
+++ b/tests/base/data_out_base_vtu_time.cc
@@ -84,7 +84,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtu_time/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_base_vtu_time_and_cycle.cc b/tests/base/data_out_base_vtu_time_and_cycle.cc
index f60fd290fc..bf17227eee 100644
--- a/tests/base/data_out_base_vtu_time_and_cycle.cc
+++ b/tests/base/data_out_base_vtu_time_and_cycle.cc
@@ -86,7 +86,7 @@ void check_all(std::ostream &log)
 
 int main()
 {
-  std::ofstream logfile("data_out_base_vtu_time_and_cycle/output");
+  std::ofstream logfile("output");
   check_all<1,1>(logfile);
   check_all<1,2>(logfile);
   check_all<2,2>(logfile);
diff --git a/tests/base/data_out_reader_01.cc b/tests/base/data_out_reader_01.cc
index 1e105e3ffd..2bc1833320 100644
--- a/tests/base/data_out_reader_01.cc
+++ b/tests/base/data_out_reader_01.cc
@@ -86,7 +86,7 @@ void check()
 
 int main()
 {
-  std::ofstream logfile("data_out_reader_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
 
   check<1,1>();
diff --git a/tests/base/full_tensor_01.cc b/tests/base/full_tensor_01.cc
index d88af2634a..d500ddf1d5 100644
--- a/tests/base/full_tensor_01.cc
+++ b/tests/base/full_tensor_01.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_02.cc b/tests/base/full_tensor_02.cc
index dc066402d2..87ee6646b6 100644
--- a/tests/base/full_tensor_02.cc
+++ b/tests/base/full_tensor_02.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_03.cc b/tests/base/full_tensor_03.cc
index 4833fd1b25..bd9997ea85 100644
--- a/tests/base/full_tensor_03.cc
+++ b/tests/base/full_tensor_03.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_04.cc b/tests/base/full_tensor_04.cc
index 742c3b6756..1b9d8d89ef 100644
--- a/tests/base/full_tensor_04.cc
+++ b/tests/base/full_tensor_04.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_04/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_05.cc b/tests/base/full_tensor_05.cc
index f81f79504d..a76973e764 100644
--- a/tests/base/full_tensor_05.cc
+++ b/tests/base/full_tensor_05.cc
@@ -79,7 +79,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_05/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_06.cc b/tests/base/full_tensor_06.cc
index fc0bd8616d..60ba3db8fb 100644
--- a/tests/base/full_tensor_06.cc
+++ b/tests/base/full_tensor_06.cc
@@ -84,7 +84,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_06/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_08.cc b/tests/base/full_tensor_08.cc
index 9a5caf016e..b906268d34 100644
--- a/tests/base/full_tensor_08.cc
+++ b/tests/base/full_tensor_08.cc
@@ -64,7 +64,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_08/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_09.cc b/tests/base/full_tensor_09.cc
index eb726fadd7..e72fd314c9 100644
--- a/tests/base/full_tensor_09.cc
+++ b/tests/base/full_tensor_09.cc
@@ -47,7 +47,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_09/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/full_tensor_10.cc b/tests/base/full_tensor_10.cc
index f21e83bcf3..cf01390379 100644
--- a/tests/base/full_tensor_10.cc
+++ b/tests/base/full_tensor_10.cc
@@ -48,7 +48,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("full_tensor_10/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/function_derivative.cc b/tests/base/function_derivative.cc
index fec5c390cc..1fd33298fa 100644
--- a/tests/base/function_derivative.cc
+++ b/tests/base/function_derivative.cc
@@ -159,7 +159,7 @@ check_sine(unsigned int nquad)
 
 int main()
 {
-  std::ofstream logfile("function_derivative/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/function_parser.cc b/tests/base/function_parser.cc
index 513a52712c..10c49aa7d7 100644
--- a/tests/base/function_parser.cc
+++ b/tests/base/function_parser.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("function_parser/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/function_parser_02.cc b/tests/base/function_parser_02.cc
index 6e4cc091b7..761e7a382e 100644
--- a/tests/base/function_parser_02.cc
+++ b/tests/base/function_parser_02.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("function_parser_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/functions_01.cc b/tests/base/functions_01.cc
index 2db6abdb4a..86066175c7 100644
--- a/tests/base/functions_01.cc
+++ b/tests/base/functions_01.cc
@@ -51,7 +51,7 @@
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/functions_02.cc b/tests/base/functions_02.cc
index d8190b0f45..e5a59cad15 100644
--- a/tests/base/functions_02.cc
+++ b/tests/base/functions_02.cc
@@ -169,7 +169,7 @@ void check_laplacian_list(const Function<dim> &f)
 
 int main()
 {
-  std::ofstream logfile("functions_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/functions_03.cc b/tests/base/functions_03.cc
index 23fbb2ee9c..b9d98719cd 100644
--- a/tests/base/functions_03.cc
+++ b/tests/base/functions_03.cc
@@ -140,7 +140,7 @@ void check_laplacian_list (const Function<dim> &f)
 
 int main()
 {
-  std::ofstream logfile("functions_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/functions_04.cc b/tests/base/functions_04.cc
index 6b50070eef..1b8d30a73c 100644
--- a/tests/base/functions_04.cc
+++ b/tests/base/functions_04.cc
@@ -196,7 +196,7 @@ check_function(const Functions::FlowFunction<dim> &f,
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/functions_05.cc b/tests/base/functions_05.cc
index 1772b8b09a..42694718ff 100644
--- a/tests/base/functions_05.cc
+++ b/tests/base/functions_05.cc
@@ -69,7 +69,7 @@ void check2 ()
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/functions_06.cc b/tests/base/functions_06.cc
index 1aa4223be5..393c03ba28 100644
--- a/tests/base/functions_06.cc
+++ b/tests/base/functions_06.cc
@@ -79,7 +79,7 @@ void check2 ()
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/functions_07.cc b/tests/base/functions_07.cc
index b0fdd3c5aa..d5cd9b810d 100644
--- a/tests/base/functions_07.cc
+++ b/tests/base/functions_07.cc
@@ -64,7 +64,7 @@ void check ()
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/functions_08.cc b/tests/base/functions_08.cc
index ac846cf66d..0bd75aed73 100644
--- a/tests/base/functions_08.cc
+++ b/tests/base/functions_08.cc
@@ -76,7 +76,7 @@ void check1 ()
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/functions_09.cc b/tests/base/functions_09.cc
index 0222814b57..934383fe21 100644
--- a/tests/base/functions_09.cc
+++ b/tests/base/functions_09.cc
@@ -128,7 +128,7 @@ void check ()
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/functions_singularity.cc b/tests/base/functions_singularity.cc
index 8e9ddd587c..7fce80a144 100644
--- a/tests/base/functions_singularity.cc
+++ b/tests/base/functions_singularity.cc
@@ -236,7 +236,7 @@ check_function_derivative(const Functions::FlowFunction<dim> &f,
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/gauss_lobatto.cc b/tests/base/gauss_lobatto.cc
index 466d3dfa36..ae10097089 100644
--- a/tests/base/gauss_lobatto.cc
+++ b/tests/base/gauss_lobatto.cc
@@ -28,7 +28,7 @@
 
 int main()
 {
-  std::ofstream logfile("gauss_lobatto/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_1.cc b/tests/base/geometry_info_1.cc
index 7639bda561..e639c87455 100644
--- a/tests/base/geometry_info_1.cc
+++ b/tests/base/geometry_info_1.cc
@@ -90,7 +90,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("geometry_info_1/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_2.cc b/tests/base/geometry_info_2.cc
index 47839fe1a3..c814487f9f 100644
--- a/tests/base/geometry_info_2.cc
+++ b/tests/base/geometry_info_2.cc
@@ -112,7 +112,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("geometry_info_2/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_3.cc b/tests/base/geometry_info_3.cc
index 9c79c24889..cede686ece 100644
--- a/tests/base/geometry_info_3.cc
+++ b/tests/base/geometry_info_3.cc
@@ -53,7 +53,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("geometry_info_3/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_4.cc b/tests/base/geometry_info_4.cc
index 7707570a79..347a0c7f62 100644
--- a/tests/base/geometry_info_4.cc
+++ b/tests/base/geometry_info_4.cc
@@ -73,7 +73,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("geometry_info_4/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_5.cc b/tests/base/geometry_info_5.cc
index 36535f9a25..81afbe8d93 100644
--- a/tests/base/geometry_info_5.cc
+++ b/tests/base/geometry_info_5.cc
@@ -74,7 +74,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("geometry_info_5/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_6.cc b/tests/base/geometry_info_6.cc
index 756f2f1c38..cc818ded83 100644
--- a/tests/base/geometry_info_6.cc
+++ b/tests/base/geometry_info_6.cc
@@ -137,7 +137,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("geometry_info_6/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_7.cc b/tests/base/geometry_info_7.cc
index 41b0aefa82..66c7576e08 100644
--- a/tests/base/geometry_info_7.cc
+++ b/tests/base/geometry_info_7.cc
@@ -192,7 +192,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("geometry_info_7/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/geometry_info_8.cc b/tests/base/geometry_info_8.cc
index 8aa2533e93..6e3097bcc5 100644
--- a/tests/base/geometry_info_8.cc
+++ b/tests/base/geometry_info_8.cc
@@ -94,7 +94,7 @@ void test_lines()
 
 int main()
 {
-  std::ofstream logfile("geometry_info_8/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/hierarchical.cc b/tests/base/hierarchical.cc
index fe8d2f9a2c..2f1478206c 100644
--- a/tests/base/hierarchical.cc
+++ b/tests/base/hierarchical.cc
@@ -33,7 +33,7 @@ using namespace Polynomials;
 
 int main ()
 {
-  std::ofstream logfile("hierarchical/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/index_set_01.cc b/tests/base/index_set_01.cc
index 203d950736..3d768866c7 100644
--- a/tests/base/index_set_01.cc
+++ b/tests/base/index_set_01.cc
@@ -46,7 +46,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_02.cc b/tests/base/index_set_02.cc
index b60f5b5366..e5faa533a3 100644
--- a/tests/base/index_set_02.cc
+++ b/tests/base/index_set_02.cc
@@ -55,7 +55,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_03.cc b/tests/base/index_set_03.cc
index f0b17596d3..8d66ec0546 100644
--- a/tests/base/index_set_03.cc
+++ b/tests/base/index_set_03.cc
@@ -50,7 +50,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_04.cc b/tests/base/index_set_04.cc
index 99fd63f645..d7016f56b3 100644
--- a/tests/base/index_set_04.cc
+++ b/tests/base/index_set_04.cc
@@ -54,7 +54,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_05.cc b/tests/base/index_set_05.cc
index 3e7d260579..3dc4e3105c 100644
--- a/tests/base/index_set_05.cc
+++ b/tests/base/index_set_05.cc
@@ -52,7 +52,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_05/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_06.cc b/tests/base/index_set_06.cc
index 3eb383b62b..981bdfb85e 100644
--- a/tests/base/index_set_06.cc
+++ b/tests/base/index_set_06.cc
@@ -52,7 +52,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_06/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_07.cc b/tests/base/index_set_07.cc
index 93e110948f..ac0bf0c872 100644
--- a/tests/base/index_set_07.cc
+++ b/tests/base/index_set_07.cc
@@ -55,7 +55,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_07/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_08.cc b/tests/base/index_set_08.cc
index dee63983bf..7a8fa63aa7 100644
--- a/tests/base/index_set_08.cc
+++ b/tests/base/index_set_08.cc
@@ -57,7 +57,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_08/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_09.cc b/tests/base/index_set_09.cc
index 7ae2458f5e..af333e6d57 100644
--- a/tests/base/index_set_09.cc
+++ b/tests/base/index_set_09.cc
@@ -47,7 +47,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_09/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_10.cc b/tests/base/index_set_10.cc
index 01cbb8e489..4a4a74deac 100644
--- a/tests/base/index_set_10.cc
+++ b/tests/base/index_set_10.cc
@@ -61,7 +61,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_10/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_11.cc b/tests/base/index_set_11.cc
index 1ae44092eb..ad038838d7 100644
--- a/tests/base/index_set_11.cc
+++ b/tests/base/index_set_11.cc
@@ -66,7 +66,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_11/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_12.cc b/tests/base/index_set_12.cc
index 1792a0fe22..bf2b231890 100644
--- a/tests/base/index_set_12.cc
+++ b/tests/base/index_set_12.cc
@@ -61,7 +61,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_12/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_13.cc b/tests/base/index_set_13.cc
index 3cdec71e35..92f98a5a8e 100644
--- a/tests/base/index_set_13.cc
+++ b/tests/base/index_set_13.cc
@@ -67,7 +67,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_13/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_14.cc b/tests/base/index_set_14.cc
index c71afb262c..8a946f38a5 100644
--- a/tests/base/index_set_14.cc
+++ b/tests/base/index_set_14.cc
@@ -74,7 +74,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_14/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_15.cc b/tests/base/index_set_15.cc
index aaea25954a..0f99ace48b 100644
--- a/tests/base/index_set_15.cc
+++ b/tests/base/index_set_15.cc
@@ -80,7 +80,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_15/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_16.cc b/tests/base/index_set_16.cc
index 7dc1bd8545..2c53c94150 100644
--- a/tests/base/index_set_16.cc
+++ b/tests/base/index_set_16.cc
@@ -64,7 +64,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_16/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_17.cc b/tests/base/index_set_17.cc
index b94cb78072..cc9ac002ba 100644
--- a/tests/base/index_set_17.cc
+++ b/tests/base/index_set_17.cc
@@ -54,7 +54,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_17/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_18.cc b/tests/base/index_set_18.cc
index fab46b9134..b5274e1e16 100644
--- a/tests/base/index_set_18.cc
+++ b/tests/base/index_set_18.cc
@@ -54,7 +54,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_18/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_19.cc b/tests/base/index_set_19.cc
index a70aa63201..d8bd8f3b1f 100644
--- a/tests/base/index_set_19.cc
+++ b/tests/base/index_set_19.cc
@@ -59,7 +59,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_19/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_20.cc b/tests/base/index_set_20.cc
index 9728193f25..cd948f2a89 100644
--- a/tests/base/index_set_20.cc
+++ b/tests/base/index_set_20.cc
@@ -100,7 +100,7 @@ void test()
 
 int main()
 {
-  std::ofstream logfile("index_set_20/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_20_offset.cc b/tests/base/index_set_20_offset.cc
index 18e0309083..5518674614 100644
--- a/tests/base/index_set_20_offset.cc
+++ b/tests/base/index_set_20_offset.cc
@@ -89,7 +89,7 @@ void test()
 
 int main()
 {
-  std::ofstream logfile("index_set_20_offset/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_21.cc b/tests/base/index_set_21.cc
index 1bcaaf199d..87298d4fe7 100644
--- a/tests/base/index_set_21.cc
+++ b/tests/base/index_set_21.cc
@@ -57,7 +57,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_21/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_22.cc b/tests/base/index_set_22.cc
index 18c386cd0a..3afe519868 100644
--- a/tests/base/index_set_22.cc
+++ b/tests/base/index_set_22.cc
@@ -55,7 +55,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_22/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_23.cc b/tests/base/index_set_23.cc
index 96050794c7..0f78b3639b 100644
--- a/tests/base/index_set_23.cc
+++ b/tests/base/index_set_23.cc
@@ -46,7 +46,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_23/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_readwrite_01.cc b/tests/base/index_set_readwrite_01.cc
index 5437adb552..f0460a87fe 100644
--- a/tests/base/index_set_readwrite_01.cc
+++ b/tests/base/index_set_readwrite_01.cc
@@ -61,7 +61,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_readwrite_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_readwrite_02.cc b/tests/base/index_set_readwrite_02.cc
index 722dad00d6..458810942e 100644
--- a/tests/base/index_set_readwrite_02.cc
+++ b/tests/base/index_set_readwrite_02.cc
@@ -64,7 +64,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_readwrite_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/index_set_readwrite_03.cc b/tests/base/index_set_readwrite_03.cc
index 4ddef5888c..f81427de6c 100644
--- a/tests/base/index_set_readwrite_03.cc
+++ b/tests/base/index_set_readwrite_03.cc
@@ -58,7 +58,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("index_set_readwrite_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/is_finite.cc b/tests/base/is_finite.cc
index 90f14eed23..81b9328bc3 100644
--- a/tests/base/is_finite.cc
+++ b/tests/base/is_finite.cc
@@ -57,7 +57,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("is_finite/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/is_finite_complex.cc b/tests/base/is_finite_complex.cc
index 67d065b49a..dd15295782 100644
--- a/tests/base/is_finite_complex.cc
+++ b/tests/base/is_finite_complex.cc
@@ -65,7 +65,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("is_finite_complex/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/log_crash_01.cc b/tests/base/log_crash_01.cc
index 4013977f8c..c4b4b28e2f 100644
--- a/tests/base/log_crash_01.cc
+++ b/tests/base/log_crash_01.cc
@@ -32,7 +32,7 @@ int main()
 
   try
     {
-      std::ofstream logfile("log_crash_01/output");
+      std::ofstream logfile("output");
       deallog.attach(logfile);
       deallog << "OK" << std::endl;
       deallog << "no newline here!";
diff --git a/tests/base/log_infinity.cc b/tests/base/log_infinity.cc
index f35a4d72f5..5f20da79db 100644
--- a/tests/base/log_infinity.cc
+++ b/tests/base/log_infinity.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("log_infinity/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/log_nan.cc b/tests/base/log_nan.cc
index 7739b1f797..3dbbad4e12 100644
--- a/tests/base/log_nan.cc
+++ b/tests/base/log_nan.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("log_nan/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/log_precision.cc b/tests/base/log_precision.cc
index 521bc4d529..d958f4f912 100644
--- a/tests/base/log_precision.cc
+++ b/tests/base/log_precision.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("log_precision/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/log_width.cc b/tests/base/log_width.cc
index c61925a4a9..175e1b62c4 100644
--- a/tests/base/log_width.cc
+++ b/tests/base/log_width.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("log_width/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/logstream_end.cc b/tests/base/logstream_end.cc
index d0cfd7a3c6..dfa3f676d1 100644
--- a/tests/base/logstream_end.cc
+++ b/tests/base/logstream_end.cc
@@ -32,7 +32,7 @@
 
 int main()
 {
-  std::ofstream logfile("logstream_end/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/logtest.cc b/tests/base/logtest.cc
index 46397f737b..045972a2e6 100644
--- a/tests/base/logtest.cc
+++ b/tests/base/logtest.cc
@@ -29,7 +29,7 @@
 
 int main()
 {
-  std::ofstream logfile("logtest/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/mutex_01.cc b/tests/base/mutex_01.cc
index bee09fd3a5..4242042561 100644
--- a/tests/base/mutex_01.cc
+++ b/tests/base/mutex_01.cc
@@ -40,7 +40,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("mutex_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/named_data.cc b/tests/base/named_data.cc
index 8c7ad959d6..068263e0f1 100644
--- a/tests/base/named_data.cc
+++ b/tests/base/named_data.cc
@@ -80,7 +80,7 @@ test_shared_pointer()
 
 int main ()
 {
-  std::ofstream logfile("named_data/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
 //  deallog.log_cerr();
diff --git a/tests/base/number_traits_complex.cc b/tests/base/number_traits_complex.cc
index 47d235c087..397cd56388 100644
--- a/tests/base/number_traits_complex.cc
+++ b/tests/base/number_traits_complex.cc
@@ -49,7 +49,7 @@ void check (const number &x)
 
 int main ()
 {
-  std::ofstream logfile("number_traits_complex/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/number_traits_real.cc b/tests/base/number_traits_real.cc
index 84a676308a..262dde0ea1 100644
--- a/tests/base/number_traits_real.cc
+++ b/tests/base/number_traits_real.cc
@@ -49,7 +49,7 @@ void check (const number &x)
 
 int main ()
 {
-  std::ofstream logfile("number_traits_real/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/parallel_accumulate.cc b/tests/base/parallel_accumulate.cc
index 42a2463283..beb93ea550 100644
--- a/tests/base/parallel_accumulate.cc
+++ b/tests/base/parallel_accumulate.cc
@@ -36,7 +36,7 @@ int sum (const int begin,
 
 int main()
 {
-  std::ofstream logfile("parallel_accumulate/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/parallel_transform_01.cc b/tests/base/parallel_transform_01.cc
index 41d7a9ebf6..6d14276161 100644
--- a/tests/base/parallel_transform_01.cc
+++ b/tests/base/parallel_transform_01.cc
@@ -29,7 +29,7 @@
 
 int main()
 {
-  std::ofstream logfile("parallel_transform_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/parallel_transform_02.cc b/tests/base/parallel_transform_02.cc
index 520fecb7bc..fc70fbdd8a 100644
--- a/tests/base/parallel_transform_02.cc
+++ b/tests/base/parallel_transform_02.cc
@@ -29,7 +29,7 @@
 
 int main()
 {
-  std::ofstream logfile("parallel_transform_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/parallel_transform_03.cc b/tests/base/parallel_transform_03.cc
index a81baea31a..2012fb6c31 100644
--- a/tests/base/parallel_transform_03.cc
+++ b/tests/base/parallel_transform_03.cc
@@ -29,7 +29,7 @@
 
 int main()
 {
-  std::ofstream logfile("parallel_transform_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/path_search.cc b/tests/base/path_search.cc
index 6c872c5599..3e75da5c6b 100644
--- a/tests/base/path_search.cc
+++ b/tests/base/path_search.cc
@@ -21,7 +21,7 @@
 
 int main()
 {
-  std::ofstream logfile("path_search/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/patterns_01.cc b/tests/base/patterns_01.cc
index 6ab401c317..d0fecf6dd6 100644
--- a/tests/base/patterns_01.cc
+++ b/tests/base/patterns_01.cc
@@ -22,7 +22,7 @@
 
 int main()
 {
-  std::ofstream logfile("patterns_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/point_01.cc b/tests/base/point_01.cc
index 28adef2075..605b30bab0 100644
--- a/tests/base/point_01.cc
+++ b/tests/base/point_01.cc
@@ -39,7 +39,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("point_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial1d.cc b/tests/base/polynomial1d.cc
index 51991db6d7..6f90816d11 100644
--- a/tests/base/polynomial1d.cc
+++ b/tests/base/polynomial1d.cc
@@ -97,7 +97,7 @@ void polynomial_arithmetic ()
 
 int main ()
 {
-  std::ofstream logfile("polynomial1d/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial_hermite_interpolation.cc b/tests/base/polynomial_hermite_interpolation.cc
index f0cd87b865..222528f45f 100644
--- a/tests/base/polynomial_hermite_interpolation.cc
+++ b/tests/base/polynomial_hermite_interpolation.cc
@@ -54,7 +54,7 @@ void interpolation_conditions(const std::vector<Polynomial<double> > &polynomial
 
 int main()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial_lagrange.cc b/tests/base/polynomial_lagrange.cc
index 8e2d3cef54..90e0a7b338 100644
--- a/tests/base/polynomial_lagrange.cc
+++ b/tests/base/polynomial_lagrange.cc
@@ -80,7 +80,7 @@ check_lge (unsigned int n)
 
 int main()
 {
-  std::ofstream logfile("polynomial_lagrange/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial_lagrange_ops.cc b/tests/base/polynomial_lagrange_ops.cc
index 7b67d26f2b..56a1befe52 100644
--- a/tests/base/polynomial_lagrange_ops.cc
+++ b/tests/base/polynomial_lagrange_ops.cc
@@ -215,7 +215,7 @@ check_poly (const Quadrature<1> &q)
 
 int main()
 {
-  std::ofstream logfile("polynomial_lagrange_ops/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial_lagrange_order.cc b/tests/base/polynomial_lagrange_order.cc
index 17982623b0..740a671c51 100644
--- a/tests/base/polynomial_lagrange_order.cc
+++ b/tests/base/polynomial_lagrange_order.cc
@@ -115,7 +115,7 @@ check_lge (unsigned int n)
 
 int main()
 {
-  std::ofstream logfile("polynomial_lagrange_order/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial_lagrange_product.cc b/tests/base/polynomial_lagrange_product.cc
index ed01525b72..6149917143 100644
--- a/tests/base/polynomial_lagrange_product.cc
+++ b/tests/base/polynomial_lagrange_product.cc
@@ -94,7 +94,7 @@ check_lge (unsigned int n)
 
 int main()
 {
-  std::ofstream logfile("polynomial_lagrange_product/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial_minus_equals.cc b/tests/base/polynomial_minus_equals.cc
index 843616e124..a198b150a1 100644
--- a/tests/base/polynomial_minus_equals.cc
+++ b/tests/base/polynomial_minus_equals.cc
@@ -33,7 +33,7 @@ using namespace dealii;
 
 int main ()
 {
-  std::ofstream logfile("polynomial_minus_equals/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomial_test.cc b/tests/base/polynomial_test.cc
index f9d3772496..22297824f3 100644
--- a/tests/base/polynomial_test.cc
+++ b/tests/base/polynomial_test.cc
@@ -144,7 +144,7 @@ check_dimensions (const std::vector<Polynomial<double> > &p)
 
 int main()
 {
-  std::ofstream logfile("polynomial_test/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(2);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomials_bdm_01.cc b/tests/base/polynomials_bdm_01.cc
index df091692bb..fd91c1c32e 100644
--- a/tests/base/polynomials_bdm_01.cc
+++ b/tests/base/polynomials_bdm_01.cc
@@ -58,7 +58,7 @@ void plot(const PolynomialsBDM<dim> &poly)
 
 int main()
 {
-  const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  const std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog << std::setprecision(3);
   deallog.attach(logfile);
diff --git a/tests/base/polynomials_rt.cc b/tests/base/polynomials_rt.cc
index e0992d0ec5..9f1c428977 100644
--- a/tests/base/polynomials_rt.cc
+++ b/tests/base/polynomials_rt.cc
@@ -57,7 +57,7 @@ void plot(const PolynomialsRaviartThomas<dim> &poly)
 
 int main()
 {
-  std::ofstream logfile("polynomials_rt/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/polynomials_tensor.cc b/tests/base/polynomials_tensor.cc
index 87c6145cf9..95f0bd6806 100644
--- a/tests/base/polynomials_tensor.cc
+++ b/tests/base/polynomials_tensor.cc
@@ -101,7 +101,7 @@ void check_rt ()
 
 int main()
 {
-  std::ofstream logfile("polynomials_tensor/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(0);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/qprojector.cc b/tests/base/qprojector.cc
index 180687ab78..690e700e6f 100644
--- a/tests/base/qprojector.cc
+++ b/tests/base/qprojector.cc
@@ -177,7 +177,7 @@ void check(Quadrature<1> &q)
 
 int main()
 {
-  std::ofstream logfile("qprojector/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog << std::setprecision(2);
diff --git a/tests/base/quadrature_selector.cc b/tests/base/quadrature_selector.cc
index 2e5f220d7f..6e917dbe5b 100644
--- a/tests/base/quadrature_selector.cc
+++ b/tests/base/quadrature_selector.cc
@@ -44,7 +44,7 @@ void check (const std::string     &name,
 
 int main()
 {
-  std::ofstream logfile("quadrature_selector/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/quadrature_test.cc b/tests/base/quadrature_test.cc
index 5a7a1c989c..ec4af15050 100644
--- a/tests/base/quadrature_test.cc
+++ b/tests/base/quadrature_test.cc
@@ -194,7 +194,7 @@ check_faces (const std::vector<Quadrature<dim-1>*>& quadratures, const bool sub)
 
 int main()
 {
-  std::ofstream logfile("quadrature_test/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/reference.cc b/tests/base/reference.cc
index 1b21b9efe3..7730221791 100644
--- a/tests/base/reference.cc
+++ b/tests/base/reference.cc
@@ -62,7 +62,7 @@ int main()
 {
   deal_II_exceptions::disable_abort_on_exception();
 
-  std::ofstream logfile("reference/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/scalar_01.cc b/tests/base/scalar_01.cc
index 72be390ea3..86b0606117 100644
--- a/tests/base/scalar_01.cc
+++ b/tests/base/scalar_01.cc
@@ -34,7 +34,7 @@ void compare (const U &u, const V &v)
 
 int main ()
 {
-  std::ofstream logfile("scalar_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/slice_vector.cc b/tests/base/slice_vector.cc
index d980341c53..d05a7d378d 100644
--- a/tests/base/slice_vector.cc
+++ b/tests/base/slice_vector.cc
@@ -37,7 +37,7 @@ int main()
 {
   deal_II_exceptions::disable_abort_on_exception();
 
-  std::ofstream logfile("slice_vector/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/symmetric_tensor_01.cc b/tests/base/symmetric_tensor_01.cc
index dfa4bd42b0..0d3dda4f83 100644
--- a/tests/base/symmetric_tensor_01.cc
+++ b/tests/base/symmetric_tensor_01.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_02.cc b/tests/base/symmetric_tensor_02.cc
index ed0482033b..1e3b75ae02 100644
--- a/tests/base/symmetric_tensor_02.cc
+++ b/tests/base/symmetric_tensor_02.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_03.cc b/tests/base/symmetric_tensor_03.cc
index 0491deab3f..68adea1e17 100644
--- a/tests/base/symmetric_tensor_03.cc
+++ b/tests/base/symmetric_tensor_03.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_04.cc b/tests/base/symmetric_tensor_04.cc
index 73cc4e73ac..b3e47b4789 100644
--- a/tests/base/symmetric_tensor_04.cc
+++ b/tests/base/symmetric_tensor_04.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_04/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_05.cc b/tests/base/symmetric_tensor_05.cc
index a5e6ae7834..718e457d77 100644
--- a/tests/base/symmetric_tensor_05.cc
+++ b/tests/base/symmetric_tensor_05.cc
@@ -80,7 +80,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_05/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_06.cc b/tests/base/symmetric_tensor_06.cc
index 494acdc5ca..3d5dc75cc1 100644
--- a/tests/base/symmetric_tensor_06.cc
+++ b/tests/base/symmetric_tensor_06.cc
@@ -84,7 +84,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_06/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_07.cc b/tests/base/symmetric_tensor_07.cc
index f46c0afa9b..0b002f9401 100644
--- a/tests/base/symmetric_tensor_07.cc
+++ b/tests/base/symmetric_tensor_07.cc
@@ -84,7 +84,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_07/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_08.cc b/tests/base/symmetric_tensor_08.cc
index 4b9de8bd3a..e7763f18ec 100644
--- a/tests/base/symmetric_tensor_08.cc
+++ b/tests/base/symmetric_tensor_08.cc
@@ -81,7 +81,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_08/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_09.cc b/tests/base/symmetric_tensor_09.cc
index fa0ec9cb41..2dacff5bb6 100644
--- a/tests/base/symmetric_tensor_09.cc
+++ b/tests/base/symmetric_tensor_09.cc
@@ -44,7 +44,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_09/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_10.cc b/tests/base/symmetric_tensor_10.cc
index c47f81cd44..674813121c 100644
--- a/tests/base/symmetric_tensor_10.cc
+++ b/tests/base/symmetric_tensor_10.cc
@@ -56,7 +56,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_10/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_11.cc b/tests/base/symmetric_tensor_11.cc
index eca04cc560..bd7b1b688b 100644
--- a/tests/base/symmetric_tensor_11.cc
+++ b/tests/base/symmetric_tensor_11.cc
@@ -58,7 +58,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_11/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_12.cc b/tests/base/symmetric_tensor_12.cc
index 14d05c0e6d..d841979191 100644
--- a/tests/base/symmetric_tensor_12.cc
+++ b/tests/base/symmetric_tensor_12.cc
@@ -43,7 +43,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_12/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_13.cc b/tests/base/symmetric_tensor_13.cc
index 179d28ef3b..6a9693bd02 100644
--- a/tests/base/symmetric_tensor_13.cc
+++ b/tests/base/symmetric_tensor_13.cc
@@ -43,7 +43,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_13/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_14.cc b/tests/base/symmetric_tensor_14.cc
index a874a61f7f..a99ad80902 100644
--- a/tests/base/symmetric_tensor_14.cc
+++ b/tests/base/symmetric_tensor_14.cc
@@ -48,7 +48,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_14/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_15.cc b/tests/base/symmetric_tensor_15.cc
index fc157f4d19..c41490fa70 100644
--- a/tests/base/symmetric_tensor_15.cc
+++ b/tests/base/symmetric_tensor_15.cc
@@ -76,7 +76,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_15/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_16.cc b/tests/base/symmetric_tensor_16.cc
index 462f94dbe1..57d1e1050e 100644
--- a/tests/base/symmetric_tensor_16.cc
+++ b/tests/base/symmetric_tensor_16.cc
@@ -43,7 +43,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_16/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_17.cc b/tests/base/symmetric_tensor_17.cc
index 228463b091..a6204f3d3d 100644
--- a/tests/base/symmetric_tensor_17.cc
+++ b/tests/base/symmetric_tensor_17.cc
@@ -71,7 +71,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_17/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_18.cc b/tests/base/symmetric_tensor_18.cc
index f9bd9970ec..49c74c59d3 100644
--- a/tests/base/symmetric_tensor_18.cc
+++ b/tests/base/symmetric_tensor_18.cc
@@ -70,7 +70,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_18/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_19.cc b/tests/base/symmetric_tensor_19.cc
index ac768a7aee..f204486812 100644
--- a/tests/base/symmetric_tensor_19.cc
+++ b/tests/base/symmetric_tensor_19.cc
@@ -125,7 +125,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_19/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_20.cc b/tests/base/symmetric_tensor_20.cc
index 94bf6a3d48..c202ef0341 100644
--- a/tests/base/symmetric_tensor_20.cc
+++ b/tests/base/symmetric_tensor_20.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_20/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_21.cc b/tests/base/symmetric_tensor_21.cc
index 19a414dbcc..e2c6d233cc 100644
--- a/tests/base/symmetric_tensor_21.cc
+++ b/tests/base/symmetric_tensor_21.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_21/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_22.cc b/tests/base/symmetric_tensor_22.cc
index 0494b4bc27..bc742c3564 100644
--- a/tests/base/symmetric_tensor_22.cc
+++ b/tests/base/symmetric_tensor_22.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_22/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_23.cc b/tests/base/symmetric_tensor_23.cc
index db774d364c..c311189dec 100644
--- a/tests/base/symmetric_tensor_23.cc
+++ b/tests/base/symmetric_tensor_23.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_23/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_24.cc b/tests/base/symmetric_tensor_24.cc
index d5a9051b4e..1f22bb4652 100644
--- a/tests/base/symmetric_tensor_24.cc
+++ b/tests/base/symmetric_tensor_24.cc
@@ -46,7 +46,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_24/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_25.cc b/tests/base/symmetric_tensor_25.cc
index c53e33e6c7..6b74730049 100644
--- a/tests/base/symmetric_tensor_25.cc
+++ b/tests/base/symmetric_tensor_25.cc
@@ -66,7 +66,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_25/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_26.cc b/tests/base/symmetric_tensor_26.cc
index 7666453c5e..50dfd226ee 100644
--- a/tests/base/symmetric_tensor_26.cc
+++ b/tests/base/symmetric_tensor_26.cc
@@ -44,7 +44,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_26/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/symmetric_tensor_27.cc b/tests/base/symmetric_tensor_27.cc
index 4d03de1485..e0445bcef7 100644
--- a/tests/base/symmetric_tensor_27.cc
+++ b/tests/base/symmetric_tensor_27.cc
@@ -58,7 +58,7 @@ void test ()
 
 int main ()
 {
-  std::ofstream logfile("symmetric_tensor_27/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/table.cc b/tests/base/table.cc
index 2d23869b6c..2b9be739ac 100644
--- a/tests/base/table.cc
+++ b/tests/base/table.cc
@@ -38,7 +38,7 @@ const int entries[] = { 11,12,13,21,
 int
 main ()
 {
-  std::ofstream logfile("table/output");
+  std::ofstream logfile("output");
   deallog << std::fixed;
   deallog << std::setprecision(0);
   deallog.attach(logfile);
diff --git a/tests/base/table_handler_01.cc b/tests/base/table_handler_01.cc
index d6e1fd97ce..85e55ef74b 100644
--- a/tests/base/table_handler_01.cc
+++ b/tests/base/table_handler_01.cc
@@ -30,7 +30,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_02.cc b/tests/base/table_handler_02.cc
index 5cab305dc8..977c1e1367 100644
--- a/tests/base/table_handler_02.cc
+++ b/tests/base/table_handler_02.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_03.cc b/tests/base/table_handler_03.cc
index f3e99f2aae..32b1882e84 100644
--- a/tests/base/table_handler_03.cc
+++ b/tests/base/table_handler_03.cc
@@ -32,7 +32,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_04.cc b/tests/base/table_handler_04.cc
index b723ee5ef4..ce85e1c401 100644
--- a/tests/base/table_handler_04.cc
+++ b/tests/base/table_handler_04.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_05.cc b/tests/base/table_handler_05.cc
index 22bfaa63af..4bebca2dcf 100644
--- a/tests/base/table_handler_05.cc
+++ b/tests/base/table_handler_05.cc
@@ -32,7 +32,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_05/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_06.cc b/tests/base/table_handler_06.cc
index 2863f99d09..6ba6409007 100644
--- a/tests/base/table_handler_06.cc
+++ b/tests/base/table_handler_06.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_06/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_07.cc b/tests/base/table_handler_07.cc
index cfad4e156e..4557c6b6b8 100644
--- a/tests/base/table_handler_07.cc
+++ b/tests/base/table_handler_07.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_07/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_08.cc b/tests/base/table_handler_08.cc
index e3beeb9e35..ea7e40dee8 100644
--- a/tests/base/table_handler_08.cc
+++ b/tests/base/table_handler_08.cc
@@ -32,7 +32,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_08/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_09.cc b/tests/base/table_handler_09.cc
index 95330167a3..460fb265b8 100644
--- a/tests/base/table_handler_09.cc
+++ b/tests/base/table_handler_09.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_09/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_10.cc b/tests/base/table_handler_10.cc
index e4666b6307..123f39dd65 100644
--- a/tests/base/table_handler_10.cc
+++ b/tests/base/table_handler_10.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_10/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_11.cc b/tests/base/table_handler_11.cc
index e735d91ee1..3b20d10e77 100644
--- a/tests/base/table_handler_11.cc
+++ b/tests/base/table_handler_11.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_11/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_12.cc b/tests/base/table_handler_12.cc
index da4066aea5..1589972db6 100644
--- a/tests/base/table_handler_12.cc
+++ b/tests/base/table_handler_12.cc
@@ -33,7 +33,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_12/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_handler_13.cc b/tests/base/table_handler_13.cc
index 1a6a019bb0..226a1cd4a6 100644
--- a/tests/base/table_handler_13.cc
+++ b/tests/base/table_handler_13.cc
@@ -31,7 +31,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_handler_13/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/table_indices_01.cc b/tests/base/table_indices_01.cc
index cc6a93ea5e..560f2b7891 100644
--- a/tests/base/table_indices_01.cc
+++ b/tests/base/table_indices_01.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("table_indices_01/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/task_01.cc b/tests/base/task_01.cc
index 96c1cd465c..90829d431a 100644
--- a/tests/base/task_01.cc
+++ b/tests/base/task_01.cc
@@ -36,7 +36,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("task_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_02.cc b/tests/base/task_02.cc
index c7a826c76d..a947b1eb96 100644
--- a/tests/base/task_02.cc
+++ b/tests/base/task_02.cc
@@ -36,7 +36,7 @@ int test ()
 
 int main()
 {
-  std::ofstream logfile("task_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_03.cc b/tests/base/task_03.cc
index 616ee60c1d..266aed58e4 100644
--- a/tests/base/task_03.cc
+++ b/tests/base/task_03.cc
@@ -38,7 +38,7 @@ void test (int i)
 
 int main()
 {
-  std::ofstream logfile("task_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_04.cc b/tests/base/task_04.cc
index 3fb1768554..e407e79415 100644
--- a/tests/base/task_04.cc
+++ b/tests/base/task_04.cc
@@ -47,7 +47,7 @@ void test (int i)
 
 int main()
 {
-  std::ofstream logfile("task_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_05.cc b/tests/base/task_05.cc
index a9fc105be4..daf42172bc 100644
--- a/tests/base/task_05.cc
+++ b/tests/base/task_05.cc
@@ -45,7 +45,7 @@ int test (int i)
 
 int main()
 {
-  std::ofstream logfile("task_05/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_06.cc b/tests/base/task_06.cc
index 991accb021..46d5cbfca3 100644
--- a/tests/base/task_06.cc
+++ b/tests/base/task_06.cc
@@ -42,7 +42,7 @@ void test (int i)
 
 int main()
 {
-  std::ofstream logfile("task_06/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_07.cc b/tests/base/task_07.cc
index d9f148710f..77c1ffee13 100644
--- a/tests/base/task_07.cc
+++ b/tests/base/task_07.cc
@@ -37,7 +37,7 @@ void test (int i)
 
 int main()
 {
-  std::ofstream logfile("task_07/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_08.cc b/tests/base/task_08.cc
index c7d19964f1..09299f8d07 100644
--- a/tests/base/task_08.cc
+++ b/tests/base/task_08.cc
@@ -38,7 +38,7 @@ void test (int i)
 
 int main()
 {
-  std::ofstream logfile("task_08/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/task_09.cc b/tests/base/task_09.cc
index 6e84e4bbe2..b0d4008650 100644
--- a/tests/base/task_09.cc
+++ b/tests/base/task_09.cc
@@ -62,7 +62,7 @@ void outer ()
 
 int main()
 {
-  std::ofstream logfile("task_09/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/tensor.cc b/tests/base/tensor.cc
index b3ad0c9561..9680f4a2cb 100644
--- a/tests/base/tensor.cc
+++ b/tests/base/tensor.cc
@@ -25,7 +25,7 @@
 
 int main ()
 {
-  std::ofstream logfile("tensor/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_02.cc b/tests/base/tensor_02.cc
index c08406da0b..9f0fb3f86b 100644
--- a/tests/base/tensor_02.cc
+++ b/tests/base/tensor_02.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("tensor_02/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_03.cc b/tests/base/tensor_03.cc
index 68ff64c4f5..24a0c873d0 100644
--- a/tests/base/tensor_03.cc
+++ b/tests/base/tensor_03.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("tensor_03/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_04.cc b/tests/base/tensor_04.cc
index 153c207731..d2ce3c544d 100644
--- a/tests/base/tensor_04.cc
+++ b/tests/base/tensor_04.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("tensor_04/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_05.cc b/tests/base/tensor_05.cc
index 524fc1d71f..19a7e79a06 100644
--- a/tests/base/tensor_05.cc
+++ b/tests/base/tensor_05.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_06.cc b/tests/base/tensor_06.cc
index e3b1474172..542107f32d 100644
--- a/tests/base/tensor_06.cc
+++ b/tests/base/tensor_06.cc
@@ -38,7 +38,7 @@ void test_tensor ()
 
 int main ()
 {
-  std::ofstream logfile("tensor_06/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_07.cc b/tests/base/tensor_07.cc
index 6ae7f21494..a4b29a86e4 100644
--- a/tests/base/tensor_07.cc
+++ b/tests/base/tensor_07.cc
@@ -74,7 +74,7 @@ void test_unequal()
 
 int main ()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_08.cc b/tests/base/tensor_08.cc
index 34ecb91aba..546a40e179 100644
--- a/tests/base/tensor_08.cc
+++ b/tests/base/tensor_08.cc
@@ -47,7 +47,7 @@ void test_select(double f1, double f2)
 
 int main ()
 {
-  std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output");
+  std::string logname = "output"
   std::ofstream logfile(logname.c_str());
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_24.cc b/tests/base/tensor_24.cc
index 21f1b43e1b..d7834f0dc7 100644
--- a/tests/base/tensor_24.cc
+++ b/tests/base/tensor_24.cc
@@ -46,7 +46,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("tensor_24/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_25.cc b/tests/base/tensor_25.cc
index e3ff1a5315..611775c225 100644
--- a/tests/base/tensor_25.cc
+++ b/tests/base/tensor_25.cc
@@ -54,7 +54,7 @@ void check ()
 
 int main ()
 {
-  std::ofstream logfile("tensor_25/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_complex.cc b/tests/base/tensor_complex.cc
index af2521e2ad..57b5810403 100644
--- a/tests/base/tensor_complex.cc
+++ b/tests/base/tensor_complex.cc
@@ -28,7 +28,7 @@
 
 int main ()
 {
-  std::ofstream logfile("tensor_complex/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/tensor_float.cc b/tests/base/tensor_float.cc
index c07415e724..d3bd9c6478 100644
--- a/tests/base/tensor_float.cc
+++ b/tests/base/tensor_float.cc
@@ -26,7 +26,7 @@
 
 int main ()
 {
-  std::ofstream logfile("tensor_float/output");
+  std::ofstream logfile("output");
   deallog << std::setprecision(3);
   deallog.attach(logfile);
   deallog.depth_console(0);
diff --git a/tests/base/thread_local_storage_01.cc b/tests/base/thread_local_storage_01.cc
index 82e3c039e5..54122d1308 100644
--- a/tests/base/thread_local_storage_01.cc
+++ b/tests/base/thread_local_storage_01.cc
@@ -103,7 +103,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_local_storage_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_local_storage_02.cc b/tests/base/thread_local_storage_02.cc
index 575b4858ad..8e3ab8e860 100644
--- a/tests/base/thread_local_storage_02.cc
+++ b/tests/base/thread_local_storage_02.cc
@@ -119,7 +119,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_local_storage_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_local_storage_03.cc b/tests/base/thread_local_storage_03.cc
index 7433568261..e8c1ffed76 100644
--- a/tests/base/thread_local_storage_03.cc
+++ b/tests/base/thread_local_storage_03.cc
@@ -60,7 +60,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_local_storage_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_local_storage_04.cc b/tests/base/thread_local_storage_04.cc
index 60863834c7..8a4c977863 100644
--- a/tests/base/thread_local_storage_04.cc
+++ b/tests/base/thread_local_storage_04.cc
@@ -72,7 +72,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_local_storage_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_01.cc b/tests/base/thread_validity_01.cc
index 6ce1434ee1..f94a311673 100644
--- a/tests/base/thread_validity_01.cc
+++ b/tests/base/thread_validity_01.cc
@@ -53,7 +53,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_02.cc b/tests/base/thread_validity_02.cc
index f0c89f103e..ee13a42934 100644
--- a/tests/base/thread_validity_02.cc
+++ b/tests/base/thread_validity_02.cc
@@ -57,7 +57,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_03.cc b/tests/base/thread_validity_03.cc
index 1c27a502fa..f4c19a99a8 100644
--- a/tests/base/thread_validity_03.cc
+++ b/tests/base/thread_validity_03.cc
@@ -58,7 +58,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_04.cc b/tests/base/thread_validity_04.cc
index 2b2d72e8ae..13c22c11f8 100644
--- a/tests/base/thread_validity_04.cc
+++ b/tests/base/thread_validity_04.cc
@@ -59,7 +59,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_05.cc b/tests/base/thread_validity_05.cc
index 7746c2d894..1cdbc8015a 100644
--- a/tests/base/thread_validity_05.cc
+++ b/tests/base/thread_validity_05.cc
@@ -91,7 +91,7 @@ void test2 ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_05/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_06.cc b/tests/base/thread_validity_06.cc
index 9c3fc87e4f..799626be49 100644
--- a/tests/base/thread_validity_06.cc
+++ b/tests/base/thread_validity_06.cc
@@ -77,7 +77,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_06/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_07.cc b/tests/base/thread_validity_07.cc
index da1e9180f1..61e218368c 100644
--- a/tests/base/thread_validity_07.cc
+++ b/tests/base/thread_validity_07.cc
@@ -48,7 +48,7 @@ void waiter (int i)
 
 int main()
 {
-  std::ofstream logfile("thread_validity_07/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_08.cc b/tests/base/thread_validity_08.cc
index e69ef0c4ec..2f878089b6 100644
--- a/tests/base/thread_validity_08.cc
+++ b/tests/base/thread_validity_08.cc
@@ -40,7 +40,7 @@ void worker ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_08/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_09.cc b/tests/base/thread_validity_09.cc
index e7d07eaa30..3daddafba0 100644
--- a/tests/base/thread_validity_09.cc
+++ b/tests/base/thread_validity_09.cc
@@ -44,7 +44,7 @@ int worker ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_09/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_10.cc b/tests/base/thread_validity_10.cc
index 0f832207bb..17f8ff5b4f 100644
--- a/tests/base/thread_validity_10.cc
+++ b/tests/base/thread_validity_10.cc
@@ -40,7 +40,7 @@ int worker ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_10/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_11.cc b/tests/base/thread_validity_11.cc
index 0f03cb2de9..978b023e6c 100644
--- a/tests/base/thread_validity_11.cc
+++ b/tests/base/thread_validity_11.cc
@@ -45,7 +45,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_11/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/thread_validity_12.cc b/tests/base/thread_validity_12.cc
index c202c64139..0b6c3e9397 100644
--- a/tests/base/thread_validity_12.cc
+++ b/tests/base/thread_validity_12.cc
@@ -44,7 +44,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("thread_validity_12/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/timer.cc b/tests/base/timer.cc
index 5b375eae63..195ebd1a51 100644
--- a/tests/base/timer.cc
+++ b/tests/base/timer.cc
@@ -59,7 +59,7 @@ void burn (unsigned int n)
 
 int main ()
 {
-  std::ofstream logfile("timer/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/timer_02.cc b/tests/base/timer_02.cc
index e54aed5575..207c4134bc 100644
--- a/tests/base/timer_02.cc
+++ b/tests/base/timer_02.cc
@@ -30,7 +30,7 @@
 
 int main ()
 {
-  std::ofstream logfile("timer_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/utilities_01.cc b/tests/base/utilities_01.cc
index 45b2f03971..dca7223815 100644
--- a/tests/base/utilities_01.cc
+++ b/tests/base/utilities_01.cc
@@ -77,7 +77,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("utilities_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/utilities_02.cc b/tests/base/utilities_02.cc
index ce9711b769..f5d7bfaf5a 100644
--- a/tests/base/utilities_02.cc
+++ b/tests/base/utilities_02.cc
@@ -41,7 +41,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("utilities_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/utilities_03.cc b/tests/base/utilities_03.cc
index 79d4b84b02..f9b2121867 100644
--- a/tests/base/utilities_03.cc
+++ b/tests/base/utilities_03.cc
@@ -45,7 +45,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("utilities_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/utilities_04.cc b/tests/base/utilities_04.cc
index 837e0b3e13..ff7bfaf331 100644
--- a/tests/base/utilities_04.cc
+++ b/tests/base/utilities_04.cc
@@ -87,7 +87,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("utilities_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/utilities_05.cc b/tests/base/utilities_05.cc
index 785289a37e..02f2293be0 100644
--- a/tests/base/utilities_05.cc
+++ b/tests/base/utilities_05.cc
@@ -61,7 +61,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("utilities_05/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/vectorization_01.cc b/tests/base/vectorization_01.cc
index 080ba67ced..8ce2129445 100644
--- a/tests/base/vectorization_01.cc
+++ b/tests/base/vectorization_01.cc
@@ -92,7 +92,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("vectorization_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/vectorization_02.cc b/tests/base/vectorization_02.cc
index b15663c5c2..dfea4c39e1 100644
--- a/tests/base/vectorization_02.cc
+++ b/tests/base/vectorization_02.cc
@@ -112,7 +112,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("vectorization_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/vectorization_03.cc b/tests/base/vectorization_03.cc
index 22876ad780..d3fec66cb7 100644
--- a/tests/base/vectorization_03.cc
+++ b/tests/base/vectorization_03.cc
@@ -90,7 +90,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("vectorization_03/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/vectorization_04.cc b/tests/base/vectorization_04.cc
index 1359e1962a..bb2e43046f 100644
--- a/tests/base/vectorization_04.cc
+++ b/tests/base/vectorization_04.cc
@@ -150,7 +150,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("vectorization_04/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/work_stream_01.cc b/tests/base/work_stream_01.cc
index 2ac20ab9fd..500db9d7d1 100644
--- a/tests/base/work_stream_01.cc
+++ b/tests/base/work_stream_01.cc
@@ -69,7 +69,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("work_stream_01/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
diff --git a/tests/base/work_stream_02.cc b/tests/base/work_stream_02.cc
index 54bcd752ae..58930a62c3 100644
--- a/tests/base/work_stream_02.cc
+++ b/tests/base/work_stream_02.cc
@@ -65,7 +65,7 @@ void test ()
 
 int main()
 {
-  std::ofstream logfile("work_stream_02/output");
+  std::ofstream logfile("output");
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);