diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
deleted file mode 100644
index 43df5658bbe0d..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Annotation/ClassAnnotationStructureSniff.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-namespace Magento\Sniffs\Annotation;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Sniff to validate structure of class, interface annotations
- */
-class ClassAnnotationStructureSniff implements Sniff
-{
-    /**
-     * @var AnnotationFormatValidator
-     */
-    private $annotationFormatValidator;
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [
-            T_CLASS
-        ];
-    }
-
-    /**
-     * AnnotationStructureSniff constructor.
-     */
-    public function __construct()
-    {
-        $this->annotationFormatValidator = new AnnotationFormatValidator();
-    }
-
-    /**
-     * Validates whether annotation block exists for interface, abstract or final classes
-     *
-     * @param File $phpcsFile
-     * @param int $previousCommentClosePtr
-     * @param int $stackPtr
-     */
-    private function validateInterfaceOrAbstractOrFinalClassAnnotationBlockExists(
-        File $phpcsFile,
-        int $previousCommentClosePtr,
-        int $stackPtr
-    ) : void {
-        $tokens = $phpcsFile->getTokens();
-        if ($tokens[$stackPtr]['type'] === 'T_CLASS') {
-            if ($tokens[$stackPtr - 2]['type'] === 'T_ABSTRACT' &&
-                $tokens[$stackPtr - 4]['content'] != $tokens[$previousCommentClosePtr]['content']
-            ) {
-                $error = 'Interface or abstract class is missing annotation block';
-                $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
-            }
-            if ($tokens[$stackPtr - 2]['type'] === 'T_FINAL' &&
-                $tokens[$stackPtr - 4]['content'] != $tokens[$previousCommentClosePtr]['content']
-            ) {
-                $error = 'Final class is missing annotation block';
-                $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
-            }
-        }
-    }
-
-    /**
-     * Validates whether annotation block exists
-     *
-     * @param File $phpcsFile
-     * @param int $previousCommentClosePtr
-     * @param int $stackPtr
-     */
-    private function validateAnnotationBlockExists(File $phpcsFile, int $previousCommentClosePtr, int $stackPtr) : void
-    {
-        $tokens = $phpcsFile->getTokens();
-        $this->validateInterfaceOrAbstractOrFinalClassAnnotationBlockExists(
-            $phpcsFile,
-            $previousCommentClosePtr,
-            $stackPtr
-        );
-        if ($tokens[$stackPtr - 2]['content'] != 'class' && $tokens[$stackPtr - 2]['content'] != 'abstract'
-            && $tokens[$stackPtr - 2]['content'] != 'final'
-            && $tokens[$stackPtr - 2]['content'] !== $tokens[$previousCommentClosePtr]['content']
-        ) {
-            $error = 'Class is missing annotation block';
-            $phpcsFile->addFixableError($error, $stackPtr, 'ClassAnnotation');
-        }
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $previousCommentClosePtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, $stackPtr - 1, 0);
-        if (!$previousCommentClosePtr) {
-            $phpcsFile->addError('Comment block is missing', $stackPtr -1, 'MethodArguments');
-            return;
-        }
-        $this->validateAnnotationBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr);
-        $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1, 0);
-        $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer'];
-        $emptyTypeTokens = [
-            T_DOC_COMMENT_WHITESPACE,
-            T_DOC_COMMENT_STAR
-        ];
-        $shortPtr = $phpcsFile->findNext($emptyTypeTokens, $commentStartPtr +1, $commentCloserPtr, true);
-        if ($shortPtr === false) {
-            $error = 'Annotation block is empty';
-            $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
-        } else {
-            $this->annotationFormatValidator->validateDescriptionFormatStructure(
-                $phpcsFile,
-                $commentStartPtr,
-                (int) $shortPtr,
-                $previousCommentClosePtr,
-                $emptyTypeTokens
-            );
-        }
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php
deleted file mode 100644
index afe559fdd6759..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/ClassAnnotationStructureSniffTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Sniffs\Annotation;
-
-class ClassAnnotationStructureSniffTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @return array
-     */
-    public function processDataProvider()
-    {
-        return [
-            [
-                'ClassAnnotationFixture.php',
-                'class_annotation_errors.txt',
-            ],
-            [
-                'AbstractClassAnnotationFixture.php',
-                'abstract_class_annotation_errors.txt',
-            ],
-            [
-                'ClassAnnotationNoShortDescriptionFixture.php',
-                'class_annotation_noshortdescription_errors.txt',
-            ],
-            [
-                'ClassAnnotationNoSpacingBetweenLinesFixture.php',
-                'class_annotation_nospacingbetweenLines_errors.txt',
-            ]
-        ];
-    }
-
-    /**
-     * Copy a file
-     *
-     * @param string $source
-     * @param string $destination
-     */
-    private function copyFile($source, $destination) : void
-    {
-        $sourcePath = $source;
-        $destinationPath = $destination;
-        $sourceDirectory = opendir($sourcePath);
-        while ($readFile = readdir($sourceDirectory)) {
-            if ($readFile != '.' && $readFile != '..') {
-                if (!file_exists($destinationPath . $readFile)) {
-                    copy($sourcePath . $readFile, $destinationPath . $readFile);
-                }
-            }
-        }
-        closedir($sourceDirectory);
-    }
-
-    /**
-     * @param string $fileUnderTest
-     * @param string $expectedReportFile
-     * @dataProvider processDataProvider
-     */
-    public function testProcess($fileUnderTest, $expectedReportFile)
-    {
-        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
-        $this->copyFile(
-            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR,
-            TESTS_TEMP_DIR . DIRECTORY_SEPARATOR
-        );
-        $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
-            'Magento',
-            $reportFile,
-            new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper()
-        );
-        $result = $codeSniffer->run(
-            [TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . $fileUnderTest]
-        );
-        $actual = file_get_contents($reportFile);
-        $expected = file_get_contents(
-            TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . $expectedReportFile
-        );
-        unlink($reportFile);
-        $this->assertEquals(2, $result);
-        $this->assertEquals($expected, $actual);
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php
deleted file mode 100644
index 43973b3083e56..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/AbstractClassAnnotationFixture.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Sniffs\Annotation;
-
-abstract class AbstractClassAnnotationFixture
-{
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php
deleted file mode 100644
index f9a997dcfeb9d..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationFixture.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Sniffs\Annotation;
-
-class ClassAnnotationFixture
-{
-    /**
-     *
-     * @inheritdoc
-     */
-    public function getProductListDefaultSortBy1()
-    {
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php
deleted file mode 100644
index be49cc6c788e9..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoShortDescriptionFixture.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Sniffs\Annotation;
-
-/**
- * @SuppressWarnings(PHPMD.NumberOfChildren)
- */
-class ClassAnnotationNoShortDescriptionFixture
-{
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php
deleted file mode 100644
index 382185734c281..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/ClassAnnotationNoSpacingBetweenLinesFixture.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Sniffs\Annotation;
-
-/**
- * Class ClassAnnotationNoSpacingBetweenLinesFixture
- * @see Magento\Sniffs\Annotation\_files
- */
-class ClassAnnotationNoSpacingBetweenLinesFixture
-{
-
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt
deleted file mode 100644
index 23698cfb72e27..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/abstract_class_annotation_errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-FILE: ...o/Sniffs/Annotation/_fixtures/AbstractClassAnnotationFixture.php
-----------------------------------------------------------------------
-FOUND 1 ERROR AFFECTING 1 LINE
-----------------------------------------------------------------------
- 11 | ERROR | [x] Interface or abstract class is missing annotation
-    |       |     block
-----------------------------------------------------------------------
-PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
-
-
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt
deleted file mode 100644
index aca2721131608..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-FILE: ...Magento/Sniffs/Annotation/_fixtures/class_annotation_fixture.php
-----------------------------------------------------------------------
-FOUND 1 ERROR AFFECTING 1 LINE
-----------------------------------------------------------------------
- 11 | ERROR | [x] Class is missing annotation block
-----------------------------------------------------------------------
-PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY
-----------------------------------------------------------------------
-
-
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt
deleted file mode 100644
index ecc702c568934..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_noshortdescription_errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-'\n
-FILE: ...nnotation/_fixtures/ClassAnnotationNoShortDescriptionFixture.php\n
-----------------------------------------------------------------------\n
-FOUND 1 ERROR AFFECTING 1 LINE\n
-----------------------------------------------------------------------\n
- 11 | ERROR | [x] Missing short description\n
-----------------------------------------------------------------------\n
-PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
-----------------------------------------------------------------------\n
-\n
-\n
-'
-
-
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt
deleted file mode 100644
index 0102ca7f79a1f..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Annotation/_files/class_annotation_nospacingbetweenLines_errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-'\n
-FILE: ...tation/_fixtures/ClassAnnotationNoSpacingBetweenLinesFixture.php\n
-----------------------------------------------------------------------\n
-FOUND 1 ERROR AFFECTING 1 LINE\n
-----------------------------------------------------------------------\n
- 13 | ERROR | [x] There must be exactly one blank line between lines short and long descriptions\n
-----------------------------------------------------------------------\n
-PHPCBF CAN FIX THE 1 MARKED SNIFF VIOLATIONS AUTOMATICALLY\n
-----------------------------------------------------------------------\n
-\n
-\n
-'