diff --git a/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php b/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php
deleted file mode 100644
index 5b179ed..0000000
--- a/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- * @link          https://github.com/cakephp/cakephp-codesniffer
- * @since         CakePHP CodeSniffer 0.1.11
- * @license       https://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-/**
- * Check for any line starting with 2 spaces - which would indicate space indenting
- * Also check for "\t " - a tab followed by a space, which is a common similar mistake
- */
-namespace CakePHP\Sniffs\WhiteSpace;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-class TabAndSpaceSniff implements Sniff
-{
-    /**
-     * @inheritDoc
-     */
-    public function register()
-    {
-        return [T_WHITESPACE];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $line = $tokens[$stackPtr]['line'];
-        if ($stackPtr > 0 && $tokens[$stackPtr - 1]['line'] !== $line) {
-            return;
-        }
-
-        if (strpos($tokens[$stackPtr]['content'], '  ') !== false) {
-            $error = 'Double space found';
-            $phpcsFile->addError($error, $stackPtr, 'DoubleSpace');
-        }
-        if (strpos($tokens[$stackPtr]['content'], " \t") !== false) {
-            $error = 'Space and tab found';
-            $phpcsFile->addError($error, $stackPtr, 'SpaceAndTab');
-        }
-        if (strpos($tokens[$stackPtr]['content'], "\t ") !== false) {
-            $error = 'Tab and space found';
-            $phpcsFile->addError($error, $stackPtr, 'TabAndSpace');
-        }
-    }
-}
diff --git a/CakePHP/Tests/WhiteSpace/TabAndSpaceUnitTest.inc b/CakePHP/Tests/WhiteSpace/TabAndSpaceUnitTest.inc
deleted file mode 100644
index 08aa478..0000000
--- a/CakePHP/Tests/WhiteSpace/TabAndSpaceUnitTest.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$var	 = 'tab and space';
-$var 	= 'space and tab';
diff --git a/CakePHP/Tests/WhiteSpace/TabAndSpaceUnitTest.php b/CakePHP/Tests/WhiteSpace/TabAndSpaceUnitTest.php
deleted file mode 100644
index 1f6c28d..0000000
--- a/CakePHP/Tests/WhiteSpace/TabAndSpaceUnitTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace CakePHP\Tests\WhiteSpace;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffTestCase;
-
-class TabAndSpaceUnitTest extends AbstractSniffTestCase
-{
-    /**
-     * @inheritDoc
-     */
-    public function getErrorList()
-    {
-        return [
-            2 => 1,
-            3 => 1,
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getWarningList()
-    {
-        return [];
-    }
-}
diff --git a/CakePHP/ruleset.xml b/CakePHP/ruleset.xml
index f4d87d2..95b9be5 100644
--- a/CakePHP/ruleset.xml
+++ b/CakePHP/ruleset.xml
@@ -255,6 +255,11 @@
     <rule ref="SlevomatCodingStandard.Attributes.RequireAttributeAfterDocComment"/>
     <rule ref="SlevomatCodingStandard.Classes.BackedEnumTypeSpacing"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireShortTernaryOperator"/>
+    <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces">
+        <properties>
+            <property name="ignoreSpacesInComment" value="true"/>
+        </properties>
+    </rule>
 
     <!-- phpcs Zend sniffs -->
     <rule ref="Zend.NamingConventions.ValidVariableName">
diff --git a/docs/README.md b/docs/README.md
index f88e5ed..3ee6362 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,7 +2,7 @@
 
 The CakePHP standard contains 155 sniffs
 
-CakePHP (19 sniffs)
+CakePHP (18 sniffs)
 -------------------
 - CakePHP.Classes.ReturnTypeHint
 - CakePHP.Commenting.DocBlockAlignment
@@ -22,7 +22,6 @@ CakePHP (19 sniffs)
 - CakePHP.WhiteSpace.FunctionClosingBraceSpace
 - CakePHP.WhiteSpace.FunctionOpeningBraceSpace
 - CakePHP.WhiteSpace.FunctionSpacing
-- CakePHP.WhiteSpace.TabAndSpace
 
 Generic (26 sniffs)
 -------------------
@@ -95,7 +94,7 @@ PSR12 (17 sniffs)
 - PSR12.Properties.ConstantVisibility
 - PSR12.Traits.UseDeclaration
 
-SlevomatCodingStandard (52 sniffs)
+SlevomatCodingStandard (53 sniffs)
 ----------------------------------
 - SlevomatCodingStandard.Arrays.TrailingArrayComma
 - SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing
@@ -149,6 +148,7 @@ SlevomatCodingStandard (52 sniffs)
 - SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing
 - SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable
 - SlevomatCodingStandard.Variables.UnusedVariable
+- SlevomatCodingStandard.Whitespaces.DuplicateSpaces
 
 Squiz (27 sniffs)
 -----------------