diff --git a/lib/build_base_lxc.sh b/lib/build_base_lxc.sh
index 2822afc..e46a331 100644
--- a/lib/build_base_lxc.sh
+++ b/lib/build_base_lxc.sh
@@ -37,7 +37,7 @@ function rebuild_base_lxc()
     IN_LXC="$lxc exec $LXC_BASE --"
 
     INSTALL_SCRIPT="https://install.yunohost.org/$DIST"
-    $IN_LXC apt install curl -y
+    $IN_LXC apt install curl eatmydata -y
     $IN_LXC /bin/bash -c "curl $INSTALL_SCRIPT | bash -s -- -a -d $YNH_BRANCH"
 
     $IN_LXC systemctl -q stop apt-daily.timer
diff --git a/lib/lxc.sh b/lib/lxc.sh
index 597fadf..a2dd90d 100644
--- a/lib/lxc.sh
+++ b/lib/lxc.sh
@@ -159,7 +159,7 @@ LXC_EXEC () {
     start_timer
 
     # Execute the command given in argument in the container and log its results.
-    $lxc exec $LXC_NAME --env PACKAGE_CHECK_EXEC=1 -t -- /bin/bash -c "$cmd" | tee -a "$full_log" $current_test_log
+    $lxc exec $LXC_NAME --env PACKAGE_CHECK_EXEC=1 -t -- /bin/bash -c "eatmydata $cmd" | tee -a "$full_log" $current_test_log
 
     # Store the return code of the command
     local returncode=${PIPESTATUS[0]}