diff --git a/packages/php/email-editor/phpcs.xml b/packages/php/email-editor/phpcs.xml
index 918a9146c4..10b1d2bbb7 100644
--- a/packages/php/email-editor/phpcs.xml
+++ b/packages/php/email-editor/phpcs.xml
@@ -16,6 +16,12 @@
 		<exclude-pattern>tests/unit/_bootstrap.php</exclude-pattern>
 	</rule>
 
+	<!-- Exclude test files from the PSR2.Methods.MethodDeclaration.Underscore rule due to methods _after() and _before() -->
+	<rule ref="PSR2.Methods.MethodDeclaration.Underscore">
+		<exclude-pattern>tests/integration</exclude-pattern>
+		<exclude-pattern>tests/unit</exclude-pattern>
+	</rule>
+
 	<!-- Skip the vendor directory -->
 	<exclude-pattern>vendor/*</exclude-pattern>
 </ruleset>
diff --git a/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Highlighting_Postprocessor_Test.php b/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Highlighting_Postprocessor_Test.php
index e6acd0762f..0d61dd70fc 100644
--- a/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Highlighting_Postprocessor_Test.php
+++ b/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Highlighting_Postprocessor_Test.php
@@ -24,7 +24,7 @@ class Highlighting_Postprocessor_Test extends \MailPoetUnitTest {
 	/**
 	 * Set up the test.
 	 */
-	public function _before() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+	public function _before() {
 		parent::_before();
 		$this->postprocessor = new Highlighting_Postprocessor();
 	}
diff --git a/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Variables_Postprocessor_Test.php b/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Variables_Postprocessor_Test.php
index ef78962e0c..23cdc0a3e2 100644
--- a/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Variables_Postprocessor_Test.php
+++ b/packages/php/email-editor/tests/unit/Engine/Renderer/Postprocessors/Variables_Postprocessor_Test.php
@@ -33,7 +33,7 @@ class Variables_Postprocessor_Test extends \MailPoetUnitTest {
 	/**
 	 * Set up the test
 	 */
-	public function _before() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+	public function _before() {
 		parent::_before();
 		$this->theme_controller_mock = $this->createMock( Theme_Controller::class );
 		$this->postprocessor         = new Variables_Postprocessor( $this->theme_controller_mock );
diff --git a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Blocks_Width_Preprocessor_Test.php b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Blocks_Width_Preprocessor_Test.php
index 23aa0e3e99..f6bf2110ff 100644
--- a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Blocks_Width_Preprocessor_Test.php
+++ b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Blocks_Width_Preprocessor_Test.php
@@ -39,7 +39,7 @@ class Blocks_Width_Preprocessor_Test extends \MailPoetUnitTest {
 	/**
 	 * Set up the test
 	 */
-	public function _before() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+	public function _before() {
 		parent::_before();
 		$this->preprocessor = new Blocks_Width_Preprocessor();
 		$this->layout       = array( 'contentSize' => '660px' );
diff --git a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Cleanup_Preprocessor_Test.php b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Cleanup_Preprocessor_Test.php
index fd10ed2e63..0ba34b5ddf 100644
--- a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Cleanup_Preprocessor_Test.php
+++ b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Cleanup_Preprocessor_Test.php
@@ -57,7 +57,7 @@ class Cleanup_Preprocessor_Test extends \MailPoetUnitTest {
 	/**
 	 * Set up the test
 	 */
-	public function _before() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+	public function _before() {
 		parent::_before();
 		$this->preprocessor = new Cleanup_Preprocessor();
 		$this->layout       = array( 'contentSize' => '660px' );
diff --git a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Spacing_Preprocessor_Test.php b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Spacing_Preprocessor_Test.php
index 775dfd7774..03437817f2 100644
--- a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Spacing_Preprocessor_Test.php
+++ b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Spacing_Preprocessor_Test.php
@@ -39,7 +39,7 @@ class Spacing_Preprocessor_Test extends \MailPoetUnitTest {
 	/**
 	 * Set up the test
 	 */
-	public function _before() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+	public function _before() {
 		parent::_before();
 		$this->preprocessor = new Spacing_Preprocessor();
 		$this->layout       = array( 'contentSize' => '660px' );
diff --git a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Typography_Preprocessor_Test.php b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Typography_Preprocessor_Test.php
index 82a4404753..ff79644336 100644
--- a/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Typography_Preprocessor_Test.php
+++ b/packages/php/email-editor/tests/unit/Engine/Renderer/Preprocessors/Typography_Preprocessor_Test.php
@@ -40,7 +40,7 @@ class Typography_Preprocessor_Test extends \MailPoetUnitTest {
 	/**
 	 * Set up the test
 	 */
-	public function _before() { // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+	public function _before() {
 		parent::_before();
 		$settings_mock = $this->createMock( Settings_Controller::class );
 		$theme_mock    = $this->createMock( \WP_Theme_JSON::class );