diff --git a/data/helpers.d/php b/data/helpers.d/php
index a590da3dd..ae9cb2ec5 100644
--- a/data/helpers.d/php
+++ b/data/helpers.d/php
@@ -287,6 +287,12 @@ ynh_remove_fpm_config () {
         fpm_service="php$YNH_DEFAULT_PHP_VERSION-fpm"
     fi
 
+    ynh_secure_remove --file="$fpm_config_dir/pool.d/$app.conf"
+    if [ -e $fpm_config_dir/conf.d/20-$app.ini ]
+    then
+        ynh_secure_remove --file="$fpm_config_dir/conf.d/20-$app.ini"
+    fi
+
     if [ $dedicated_service -eq 1 ]
     then
         # Remove the dedicated service PHP-FPM service for the app
@@ -299,12 +305,6 @@ ynh_remove_fpm_config () {
         ynh_systemd_action --service_name=$fpm_service --action=reload
     fi
 
-    ynh_secure_remove --file="$fpm_config_dir/pool.d/$app.conf"
-    if [ -e $fpm_config_dir/conf.d/20-$app.ini ]
-    then
-        ynh_secure_remove --file="$fpm_config_dir/conf.d/20-$app.ini"
-    fi
-
     # If the PHP version used is not the default version for YunoHost
     if [ "$phpversion" != "$YNH_DEFAULT_PHP_VERSION" ]
     then
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 301d37398..94d91f9b2 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -3431,11 +3431,6 @@ def _assert_system_is_sane_for_app(manifest, when):
     services_status = {s:service_status(s) for s in services}
     faulty_services = [f"{s} ({status['status']})" for s, status in services_status.items() if status['status'] != "running"]
 
-    # Stupid tmp fix to try to track why the tests are failing
-    if "php7.3-fpm" in [s for s, status in services_status.items() if status['status'] != "running"]:
-        logger.info([status for s, status in services_status.items() if status['status'] != "running"])
-        os.system("journalctl -u php7.3-fpm -n 300 --no-hostname --no-pager")
-
     if faulty_services:
         if when == "pre":
             raise YunohostValidationError(
@@ -3609,7 +3604,7 @@ def _patch_legacy_helpers(app_folder):
             content = read_file(filename)
         except MoulinetteError:
             continue
-        
+
         replaced_stuff = False
         show_warning = False