diff --git a/CHANGELOG.md b/CHANGELOG.md
index d422c7c62..2e4b5f899 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
    * Upgraded to **composer v2.1.14** for PHP 8.1 compatibility
    * Added third `$name` parameter to `Blueprint::flattenData()` method, useful for flattening repeating data
    * `ControllerResponseTrait`: Redirect response should be json if the extension is .json
+   * When symlinking Grav install, include also tests
 3. [](#bugfix)
    * Fixed bad key lookup in `FlexRelatedDirectoryTrait::getCollectionByProperty()`
    * Fixed RequestHandlers `NotFoundException` having empty request
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
index d865b4ae7..995812c1f 100644
--- a/system/src/Grav/Console/Cli/SandboxCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -200,6 +200,10 @@ class SandboxCommand extends GravCommand
         $io->newLine();
         $io->writeln('<comment>Resetting Symbolic Links</comment>');
 
+        // Symlink also tests if using git.
+        if (is_dir($this->source . '/tests')) {
+            $this->mappings['/tests'] = '/tests';
+        }
 
         foreach ($this->mappings as $source => $target) {
             if ((string)(int)$source === (string)$source) {