diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..76f5804
--- /dev/null
+++ b/tests.toml
@@ -0,0 +1,78 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    # -------------------------------------------------------------------------------
+    # EVERYTHING PAST THIS POINT IS OPTIONAL AND MOST LIKELY UNNECESSARY FOR NEW APPS
+    #--------------------------------------------------------------------------------
+    ## Conventions in this sample:
+    ## <- An actual comment
+    # <- uncommenting this should be a valid entry in 'tests.toml'
+
+    ## NB: the tests to run are automatically deduced by the CI script according to the
+    ## content of the app's manifest. The declarations below allow to customize which
+    ## tests are ran, possibly add special test suite to test special args, or
+    ## declare which commits to test upgrade from.
+    ##
+    ## You can also decide (though this is discouraged!) to ban/ignore some tests,
+    ## 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
+    ## NB: you should NOT need this except if you really have a good reason...
+
+    # exclude = ["install.private", "install.multi"]
+
+    ## For special usecases, sometimes you need to setup other things on the machine
+    ## prior to installing the app (such as installing another app)
+    ## (Remove this key entirely if not needed)
+    
+    # preinstall = """
+    # sudo yunohost app install foobar
+    # sudo yunohost user list
+    # """
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    ## By default, the CI will automagically fill the 'standard' args
+    ## such as domain, path, admin, is_public and password with relevant values
+    ## and also install args with a "default" provided in the manifest..
+    ## It should only make sense to declare custom args here for args with no default values
+    ## NB: you should NOT need those lines unless for custom questions with no obvious/default value
+
+    # args.language = "fr_FR"
+    # args.multisite = 0
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+    
+    ## 00a1a6e7 is part of commit SHA, preferrably from 'master' branch
+    ## that points to valid install of previous version
+
+    # test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4"
+    # test_upgrade_from.00a1a6e7.args.foo = "bar"
+
+
+## This is an additional test suite
+# [some_additional_testsuite]
+
+    ## On additional tests suites, you can decide to run only specific tests
+
+    # only = ["install.subdir"]
+
+    # args.language = "en_GB"
+    # args.multisite = 1
diff --git a/tests.toml.example b/tests.toml.example
deleted file mode 100644
index 26bb7e4..0000000
--- a/tests.toml.example
+++ /dev/null
@@ -1,67 +0,0 @@
-#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
-
-test_format = 1.0
-
-[default]
-
-    # ------------
-    # Tests to run
-    # ------------
-
-    # NB: the tests to run are automatically deduced by the CI script according to the
-    # content of the app's manifest. The declarations below allow to customize which
-    # tests are ran, possibly add special test suite to test special args, or
-    # declare which commits to test upgrade from.
-    #
-    # You can also decide (though this is discouraged!) to ban/ignore some tests,
-
-    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
-    # NB: you should NOT need this except if you really have a good reason...
-
-    # For special usecases, sometimes you need to setup other things on the machine
-    # prior to installing the app (such as installing another app)
-    # (Remove this key entirely if not needed)
-    preinstall = """
-    sudo yunohost app install foobar
-    sudo yunohost user list
-    """
-
-    # -------------------------------
-    # Default args to use for install
-    # -------------------------------
-
-    # By default, the CI will automagically fill the 'standard' args
-    # such as domain, path, admin, is_public and password with relevant values
-    # and also install args with a "default" provided in the manifest..
-    # It should only make sense to declare custom args here for args with no default values
-
-    args.language = "fr_FR"
-    args.multisite = 0
-    # NB: you should NOT need those lines unless for custom questions with no obvious/default value
-
-    # -------------------------------
-    # Commits to test upgrade from
-    # -------------------------------
-
-    test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4"
-    test_upgrade_from.00a1a6e7.args.foo = "bar"
-
-
-# This is an additional test suite
-[some_additional_testsuite]
-
-    # On additional tests suites, you can decide to run only specific tests
-
-    only = ["install.subdir"]
-
-    args.language = "en_GB"
-    args.multisite = 1