diff --git a/software/beremiz-ide/buildout.hash.cfg b/software/beremiz-ide/buildout.hash.cfg
index be4c4d64130012612a27aa142d285f9626ded79e..5c9d81f70d20b978bdaaf1cef8eb36e37b18696f 100644
--- a/software/beremiz-ide/buildout.hash.cfg
+++ b/software/beremiz-ide/buildout.hash.cfg
@@ -23,7 +23,7 @@ md5sum = 51071494633f4ffba700baf935dc6955
 
 [template-instance-beremiz-test]
 filename = instance-beremiz-test.cfg.jinja2.in
-md5sum = 6049681908c5619d94499a6f4f224045
+md5sum = ff7cf06927041f6aec5ad559950b69cb
 
 [template-fluxbox-menu.in]
 filename = fluxbox-menu.in
diff --git a/software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in b/software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
index eb6c93f98cb65492f4b771d67318a8e359d016fc..93261383f12423731ea7e0685f8fddbd7c88e331 100644
--- a/software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
+++ b/software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
@@ -30,7 +30,11 @@ recipe = slapos.recipe.template
 inline =
   #!/bin/sh -e
   cd {{ beremiz_location }}/tests
-  make test_dir=${directory:tests} xserver_command='echo "Using ${xserver:display} on Slapos X Server !";' "$@"
+  testdir=$SLAPOS_TEST_LOG_DIRECTORY
+  if [ -z "$testdir" ]; then
+    testdir=${directory:tests}
+  fi
+  make test_dir=$testdir xserver_command='echo "Using ${xserver:display} on Slapos X Server !";' "$@"
 output = ${directory:bin}/beremiztest
 
 [sikulix]