diff --git a/tests/TestCase/Annotator/EntityAnnotatorTest.php b/tests/TestCase/Annotator/EntityAnnotatorTest.php
index 0b77700d..e9943216 100644
--- a/tests/TestCase/Annotator/EntityAnnotatorTest.php
+++ b/tests/TestCase/Annotator/EntityAnnotatorTest.php
@@ -432,6 +432,37 @@ public function testAnnotateWithGenericUsage() {
 		$this->assertTextContains('   -> 1 annotation added, 1 annotation updated', $output);
 	}
 
+	/**
+	 * @return void
+	 */
+	public function testAnnotateWithDuplicates() {
+		/** @var \TestApp\Model\Table\FoosTable $Table */
+		$Table = TableRegistry::getTableLocator()->get('Foos');
+
+		$schema = $Table->getSchema();
+		$associations = $Table->associations();
+		$annotator = $this->_getAnnotatorMock(['schema' => $schema, 'associations' => $associations]);
+
+		$expectedContent = str_replace(["\r\n", "\r"], "\n", file_get_contents(TEST_FILES . 'Model/Entity/PHP/Duplicates.php'));
+		$callback = function ($value) use ($expectedContent) {
+			$value = str_replace(["\r\n", "\r"], "\n", $value);
+			if ($value !== $expectedContent) {
+				$this->_displayDiff($expectedContent, $value);
+			}
+
+			return $value === $expectedContent;
+		};
+		$annotator->expects($this->once())->method('storeFile')->with($this->anything(), $this->callback($callback));
+
+		$path = APP . 'Model/Entity/PHP/Duplicates.php';
+
+		$annotator->annotate($path);
+
+		$output = $this->out->output();
+
+		$this->assertTextContains('   -> 1 annotation removed', $output);
+	}
+
 	/**
 	 * @param array $params
 	 * @return \IdeHelper\Annotator\EntityAnnotator|\PHPUnit\Framework\MockObject\MockObject
diff --git a/tests/test_app/src/Model/Entity/PHP/Duplicates.php b/tests/test_app/src/Model/Entity/PHP/Duplicates.php
new file mode 100644
index 00000000..aad8e058
--- /dev/null
+++ b/tests/test_app/src/Model/Entity/PHP/Duplicates.php
@@ -0,0 +1,16 @@
+<?php
+namespace TestApp\Model\Entity\PHP;
+
+use Cake\ORM\Entity;
+
+/**
+ * @property int $id
+ * @property string $name
+ * @property string $content
+ * @property \Cake\I18n\DateTime $created
+ * @property \Cake\I18n\DateTime|null $modified
+ * @property \Cake\I18n\Date $offer_date
+ * @property int $content
+ */
+class Duplicates extends Entity {
+}
diff --git a/tests/test_app/src/Model/Entity/PHP/Generics.php b/tests/test_app/src/Model/Entity/PHP/Generics.php
index bec69740..7b67ba80 100644
--- a/tests/test_app/src/Model/Entity/PHP/Generics.php
+++ b/tests/test_app/src/Model/Entity/PHP/Generics.php
@@ -1,5 +1,5 @@
 <?php
-namespace TestApp\Model\Entity\PHP7;
+namespace TestApp\Model\Entity\PHP;
 
 use Cake\ORM\Entity;
 
diff --git a/tests/test_files/Model/Entity/PHP/Duplicates.php b/tests/test_files/Model/Entity/PHP/Duplicates.php
new file mode 100644
index 00000000..539fb26a
--- /dev/null
+++ b/tests/test_files/Model/Entity/PHP/Duplicates.php
@@ -0,0 +1,15 @@
+<?php
+namespace TestApp\Model\Entity\PHP;
+
+use Cake\ORM\Entity;
+
+/**
+ * @property int $id
+ * @property string $name
+ * @property string $content
+ * @property \Cake\I18n\DateTime $created
+ * @property \Cake\I18n\DateTime|null $modified
+ * @property \Cake\I18n\Date $offer_date
+ */
+class Duplicates extends Entity {
+}
diff --git a/tests/test_files/Model/Entity/PHP/Generics.php b/tests/test_files/Model/Entity/PHP/Generics.php
index a37ee08d..dd267d72 100644
--- a/tests/test_files/Model/Entity/PHP/Generics.php
+++ b/tests/test_files/Model/Entity/PHP/Generics.php
@@ -1,5 +1,5 @@
 <?php
-namespace TestApp\Model\Entity\PHP7;
+namespace TestApp\Model\Entity\PHP;
 
 use Cake\ORM\Entity;