diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
index 8e1333723..26e2c80ad 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php
@@ -51,19 +51,10 @@ final class GH6217Test extends OrmFunctionalTestCase
     }
 }
 
-/**
- * @Entity
- * @Cache(usage="NONSTRICT_READ_WRITE")
- */
+/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217User
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -75,13 +66,7 @@ class GH6217User
 /** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Profile
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -90,19 +75,10 @@ class GH6217Profile
     }
 }
 
-/**
- * @Entity
- * @Cache(usage="NONSTRICT_READ_WRITE")
- */
+/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217Category
 {
-    /**
-     * @Id
-     * @Column(type="string")
-     * @GeneratedValue(strategy="NONE")
-     *
-     * @var string
-     */
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
     public $id;
 
     public function __construct()
@@ -111,37 +87,16 @@ class GH6217Category
     }
 }
 
-/**
- * @Entity
- * @Cache(usage="NONSTRICT_READ_WRITE")
- */
+/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */
 class GH6217UserProfile
 {
-    /**
-     * @Id
-     * @Cache("NONSTRICT_READ_WRITE")
-     * @ManyToOne(targetEntity="GH6217User")
-     *
-     * @var GH6217User
-     */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217User::class) */
     public $user;
 
-    /**
-     * @Id
-     * @Cache("NONSTRICT_READ_WRITE")
-     * @ManyToOne(targetEntity="GH6217Profile", fetch="EAGER")
-     *
-     * @var GH6217Profile
-     */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Profile::class) */
     public $profile;
 
-    /**
-     * @Id
-     * @Cache("NONSTRICT_READ_WRITE")
-     * @ManyToOne(targetEntity="GH6217Category", fetch="EAGER")
-     *
-     * @var GH6217Category
-     */
+    /** @Id @Cache("NONSTRICT_READ_WRITE") @ManyToOne(targetEntity=GH6217Category::class) */
     public $category;
 
     public function __construct(GH6217User $user, GH6217Profile $profile, GH6217Category $category)