Merge branch '5.4' into 6.4

* 5.4:
  Update advice

Author: javiereguiluz

testing.rst

@@ -97,7 +97,8 @@ You can run tests using the ``bin/phpunit`` command:
 .. tip::
 
     In large test suites, it can make sense to create subdirectories for
-    each type of tests (e.g. ``tests/Unit/`` and ``tests/Functional/``).
+    each type of test (``tests/Unit/``, ``tests/Integration/``,
+    ``tests/Application/``, etc.).
 
 .. _integration-tests: