diff --git a/tests/annotation.php b/tests/lang/doc-comment/annotation.php
similarity index 100%
rename from tests/annotation.php
rename to tests/lang/doc-comment/annotation.php
diff --git a/tests/annotation.php.faces b/tests/lang/doc-comment/annotation.php.faces
similarity index 100%
rename from tests/annotation.php.faces
rename to tests/lang/doc-comment/annotation.php.faces
diff --git a/tests/comments.php b/tests/lang/doc-comment/comments.php
similarity index 100%
rename from tests/comments.php
rename to tests/lang/doc-comment/comments.php
diff --git a/tests/comments.php.24.faces b/tests/lang/doc-comment/comments.php.24.faces
similarity index 100%
rename from tests/comments.php.24.faces
rename to tests/lang/doc-comment/comments.php.24.faces
diff --git a/tests/comments.php.27.faces b/tests/lang/doc-comment/comments.php.27.faces
similarity index 100%
rename from tests/comments.php.27.faces
rename to tests/lang/doc-comment/comments.php.27.faces
diff --git a/tests/comments.php.faces b/tests/lang/doc-comment/comments.php.faces
similarity index 100%
rename from tests/comments.php.faces
rename to tests/lang/doc-comment/comments.php.faces
diff --git a/tests/doc-comment/inheritdoc.php b/tests/lang/doc-comment/inheritdoc.php
similarity index 100%
rename from tests/doc-comment/inheritdoc.php
rename to tests/lang/doc-comment/inheritdoc.php
diff --git a/tests/doc-comment/inheritdoc.php.faces b/tests/lang/doc-comment/inheritdoc.php.faces
similarity index 100%
rename from tests/doc-comment/inheritdoc.php.faces
rename to tests/lang/doc-comment/inheritdoc.php.faces
diff --git a/tests/issue-8.php b/tests/lang/doc-comment/issue-8.php
similarity index 100%
rename from tests/issue-8.php
rename to tests/lang/doc-comment/issue-8.php
diff --git a/tests/issue-8.php.faces b/tests/lang/doc-comment/issue-8.php.faces
similarity index 100%
rename from tests/issue-8.php.faces
rename to tests/lang/doc-comment/issue-8.php.faces
diff --git a/tests/doc-comment/return-type.php b/tests/lang/doc-comment/return-type.php
similarity index 100%
rename from tests/doc-comment/return-type.php
rename to tests/lang/doc-comment/return-type.php
diff --git a/tests/doc-comment/return-type.php.faces b/tests/lang/doc-comment/return-type.php.faces
similarity index 100%
rename from tests/doc-comment/return-type.php.faces
rename to tests/lang/doc-comment/return-type.php.faces
diff --git a/tests/php-mode-test.el b/tests/php-mode-test.el
index abc6802d..f83e7fa7 100644
--- a/tests/php-mode-test.el
+++ b/tests/php-mode-test.el
@@ -170,10 +170,6 @@ file name and check that the faces of the fonts in the buffer match."
   "Proper indentation for classs and functions in namespace block."
   (with-php-mode-test ("namespace-block.php" :indent t :magic t)))
 
-(ert-deftest php-mode-test-issue-8 ()
-  "Annotation highlighting."
-  (with-php-mode-test ("issue-8.php" :faces t)))
-
 (ert-deftest php-mode-test-issue-9 ()
   "Single quote in text in HTML misinterpreted.
 The next character after \">We\" is a single quote. It should not
@@ -560,10 +556,6 @@ style from Drupal."
     (should (eq 'php-variable-sigil (get-text-property (match-beginning 0) 'face)))
     (should (eq 'php-variable-name (get-text-property (1+ (match-beginning 0)) 'face)))))
 
-(ert-deftest psr-5-style-tag-annotation ()
-  "PSR-5 style tag annotation."
-  (with-php-mode-test ("annotation.php" :faces t)))
-
 (ert-deftest php-mode-test-issue-305 ()
   "Test highlighting variables which contains 'this' or 'that'."
   (with-php-mode-test ("issue-305.php" :faces t)))
@@ -675,13 +667,15 @@ Meant for `php-mode-test-issue-503'."
 
 (ert-deftest php-mode-test-lang ()
   "Test highlighting for language constructs."
-  (with-php-mode-test ("comments.php"
+  (with-php-mode-test ("lang/class/anonymous-class.php" :indent t :magic t :faces t))
+  (with-php-mode-test ("lang/doc-comment/comments.php"
                        :faces (cond ((eq emacs-major-version 24) ".24.faces")
                                     ((version<= "27" emacs-version) ".27.faces")
                                     (t t))))
-  (with-php-mode-test ("doc-comment/return-type.php" :faces t))
-  (with-php-mode-test ("doc-comment/inheritdoc.php" :faces t))
-  (with-php-mode-test ("lang/class/anonymous-class.php" :indent t :magic t :faces t))
+  (with-php-mode-test ("lang/doc-comment/annotation.php" :faces t))
+  (with-php-mode-test ("lang/doc-comment/issue-8.php" :faces t))
+  (with-php-mode-test ("lang/doc-comment/inheritdoc.php" :faces t))
+  (with-php-mode-test ("lang/doc-comment/return-type.php" :faces t))
   (with-php-mode-test ("lang/function/calls.php" :faces t))
   (with-php-mode-test ("lang/function/closure.php" :indent t :magic t :faces t))
   (with-php-mode-test ("lang/try-cactch/multiple.php" :faces t))