diff --git a/scripts/install b/scripts/install
index 88676db..78cd258 100644
--- a/scripts/install
+++ b/scripts/install
@@ -24,10 +24,6 @@ fi
 ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=multisite --value=$multisite
 
-#ynh_app_setting_set --app=$app --key=overwrite_nginx --value=1
-#ynh_app_setting_set --app=$app --key=overwrite_phpfpm --value=1
-#REMOVEME? ynh_app_setting_set --app=$app --key=admin_mail_html --value=1
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -100,7 +96,7 @@ yunohost app ssowatconf
 ynh_systemd_action --service_name=nginx --action=reload
 
 # Wordpress installation
-ynh_local_curl "/wp-admin/install.php?step=2" "&weblog_title=YunoBlog" "user_name=$admin_wordpress" "admin_password=$db_pwd" "admin_password2=$db_pwd" "admin_email=$admin_wordpress@$domain" "Submit=Install+WordPress"
+ynh_local_curl "/wp-admin/install.php?step=2" "&weblog_title=YunoBlog" "user_name=$admin" "admin_password=$db_pwd" "admin_password2=$db_pwd" "admin_email=$admin@$domain" "Submit=Install+WordPress"
 
 ynh_print_info --message="Please wait during Wordpress installation..."
 for i in `seq 1 300`
diff --git a/tests.toml b/tests.toml
index e69de29..a84a8fc 100644
--- a/tests.toml
+++ b/tests.toml
@@ -0,0 +1,31 @@
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    exclude = ["install.private", "install.multi"]  # The test IDs to be used in only/exclude statements are: install.root, install.subdir, install.nourl, install.multi, backup_restore, upgrade, upgrade.someCommitId change_url
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    args.multisite = 0
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+
+    test_upgrade_from.773073679873fbed3562c2d315f58eb4c1c0d4fc.name = "Upgrade from 5.8"
+
+# This is an additional test suite
+[with_multisite]
+
+    # On additional tests suites, you can decide to run only specific tests
+
+    only = ["install.subdir"]
+
+    args.language = "en_GB"
+    args.multisite = 1