diff --git a/config/filesystems.php b/config/filesystems.php
index 0803ec1b7..1169cfb93 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -86,6 +86,7 @@ return [
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
+            'endpoint' => env('AWS_ENDPOINT'),
         ],
 
     ],
diff --git a/config/mail.php b/config/mail.php
index 9d357587a..493071742 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -41,6 +41,7 @@ return [
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
+            'timeout' => env('MAIL_TIMEOUT'),
         ],
 
         'ses' => [
diff --git a/config/session.php b/config/session.php
index 4f9756aef..257fc398e 100644
--- a/config/session.php
+++ b/config/session.php
@@ -185,7 +185,7 @@ return [
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
-    | do not enable this as other CSRF protection services are in place.
+    | will set this value to "lax" since this is a secure default value.
     |
     | Supported: "lax", "strict", "none", null
     |
diff --git a/phpunit.xml b/phpunit.xml
index a32e1fc5d..d59f4c3a9 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -27,5 +27,6 @@
         <server name="MAIL_MAILER" value="array"/>
         <server name="QUEUE_CONNECTION" value="sync"/>
         <server name="SESSION_DRIVER" value="array"/>
+        <server name="TELESCOPE_ENABLED" value="false"/>
     </php>
 </phpunit>