diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
index 27a069cb18..29a810c870 100644
--- a/UPGRADE-3.4.md
+++ b/UPGRADE-3.4.md
@@ -1,6 +1,13 @@
 UPGRADE FROM 3.3 to 3.4
 =======================
 
+Finder
+------
+
+ * The `Symfony\Component\Finder\Iterator\FilterIterator` class has been
+   deprecated and will be removed in 4.0 as it used to fix a bug which existed 
+   before version 5.5.23/5.6.7
+
 Validator
 ---------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index ecfd8b090e..e4d9df88d6 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -145,6 +145,8 @@ Finder
 ------
 
  * The `ExceptionInterface` has been removed.
+ * The `Symfony\Component\Finder\Iterator\FilterIterator` class has been
+   removed as it used to fix a bug which existed before version 5.5.23/5.6.7
 
 Form
 ----
diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md
index cf19de6930..1c6419658b 100644
--- a/src/Symfony/Component/Finder/CHANGELOG.md
+++ b/src/Symfony/Component/Finder/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * deprecated `Symfony\Component\Finder\Iterator\FilterIterator`
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Component/Finder/Iterator/FilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilterIterator.php
index 3c3c3fbec0..a182f10eb8 100644
--- a/src/Symfony/Component/Finder/Iterator/FilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/FilterIterator.php
@@ -18,6 +18,8 @@ namespace Symfony\Component\Finder\Iterator;
  * @see https://bugs.php.net/68557
  *
  * @author Alex Bogomazov
+ *
+ * @deprecated since 3.4, to be removed in 4.0.
  */
 abstract class FilterIterator extends \FilterIterator
 {
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php
index 4f12d142e7..8b1a4482ba 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php
@@ -13,6 +13,8 @@ namespace Symfony\Component\Finder\Tests\Iterator;
 
 /**
  * @author Alex Bogomazov
+ *
+ * @group legacy
  */
 class FilterIteratorTest extends RealIteratorTestCase
 {