diff --git a/app/config/config.yml b/app/config/config.yml
index a4f780651..e5faee4a0 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -62,16 +62,6 @@ doctrine:
     dbal:
         # if you don't want to use SQLite, change the URL in parameters.yml or set the DATABASE_URL environment variable
         url: '%env(DATABASE_URL)%'
-
-        # instead of using a URL, you may also uncomment the following lines to configure your database
-        # driver:   pdo_mysql
-        # host:     '%database_host%'
-        # port:     '%database_port%'
-        # dbname:   '%database_name%'
-        # user:     '%database_user%'
-        # password: '%database_password%'
-        # charset:  UTF8
-
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
         auto_mapping: true
@@ -83,8 +73,5 @@ doctrine:
 # stores options that change from one server to another
 #
 swiftmailer:
-    transport: '%mailer_transport%'
-    host:      '%mailer_host%'
-    username:  '%mailer_user%'
-    password:  '%mailer_password%'
-    spool:     { type: memory }
+    url : '%env(MAILER_URL)%'
+    spool: { type: memory }
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 57c9f4709..cdbd61ccb 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -15,14 +15,6 @@ web_profiler:
 # swiftmailer:
 #     disable_delivery: true
 
-# It's recommended to use a separate database for tests. This allows to have a
-# fixed and known set of data fixtures, it simplifies the code of tests and it
-# makes them more robust.
-# In this case we just need to define a different path for the application database.
-doctrine:
-    dbal:
-        path: "%kernel.project_dir%/var/data/blog_test.sqlite"
-
 # this configuration simplifies testing URLs protected by the security mechanism
 # See https://symfony.com/doc/current/cookbook/testing/http_authentication.html
 security:
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index e414e8e80..56abbab63 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -33,7 +33,4 @@ parameters:
 
     # If you don't use a real mail server, you can send emails via your Gmail account.
     # see https://symfony.com/doc/current/cookbook/email/gmail.html
-    mailer_transport:  smtp
-    mailer_host:       127.0.0.1
-    mailer_user:       ~
-    mailer_password:   ~
+    env(MAILER_URL): 'smtp://localhost:25?encryption=&auth_mode='
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 04d542ede..56b46aa0a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,6 +10,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="KERNEL_DIR" value="app/" />
+        <env name="DATABASE_URL" value="sqlite:///var/data/blog_test.sqlite"/>
     </php>
 
     <testsuites>