diff --git a/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml b/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml
index eb458d8d100..34f25dbb6f4 100644
--- a/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml
+++ b/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml
@@ -36,24 +36,6 @@
     <lineContent>final DetailAST semi = ast.getNextSibling();</lineContent>
   </mutation>
 
-  <mutation unstable="false">
-    <sourceFile>EmptyForIteratorPadCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck</mutatedClass>
-    <mutatedMethod>setOption</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/lang/String::toUpperCase with receiver</description>
-    <lineContent>option = PadOption.valueOf(optionStr.trim().toUpperCase(Locale.ENGLISH));</lineContent>
-  </mutation>
-
-  <mutation unstable="false">
-    <sourceFile>EmptyForIteratorPadCheck.java</sourceFile>
-    <mutatedClass>com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck</mutatedClass>
-    <mutatedMethod>setOption</mutatedMethod>
-    <mutator>org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator</mutator>
-    <description>replaced call to java/lang/String::trim with receiver</description>
-    <lineContent>option = PadOption.valueOf(optionStr.trim().toUpperCase(Locale.ENGLISH));</lineContent>
-  </mutation>
-
   <mutation unstable="false">
     <sourceFile>EmptyLineSeparatorCheck.java</sourceFile>
     <mutatedClass>com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck</mutatedClass>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java
index 02c0e000db5..168d3b37548 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheckTest.java
@@ -107,4 +107,25 @@ public void testInvalidOption() throws Exception {
         }
     }
 
+    @Test
+    public void testTrimOptionProperty() throws Exception {
+        final String[] expected = {
+            "20:31: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputEmptyForIteratorPadToCheckTrimFunctionInOptionProperty.java"),
+                expected);
+
+    }
+
+    @Test
+    public void testUppercaseOptionProperty() throws Exception {
+        final String[] expected = {
+            "20:31: " + getCheckMessage(MSG_WS_NOT_FOLLOWED, ";"),
+        };
+        verifyWithInlineConfigParser(
+                getPath("InputEmptyForIteratorPadToCheckUppercaseFunctionInOptionProperty.java"),
+                expected);
+
+    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/InputEmptyForIteratorPadToCheckTrimFunctionInOptionProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/InputEmptyForIteratorPadToCheckTrimFunctionInOptionProperty.java
new file mode 100644
index 00000000000..369cf9ab796
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/InputEmptyForIteratorPadToCheckTrimFunctionInOptionProperty.java
@@ -0,0 +1,28 @@
+/*
+EmptyForIteratorPad
+option = \tSPACE
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.whitespace.emptyforiteratorpad;
+
+class InputEmptyForIteratorPadToCheckTrimFunctionInOptionProperty {
+
+    void method() {
+
+        for (int i = 0; i < 1;i++ ) {
+        }
+
+        for (int i = 0; i < 1; i++ ) {
+        }
+
+        for (int i = 0; i < 1;) { // violation '';' is not followed by whitespace'
+            i++;
+        }
+
+        for (int i = 0; i < 1; ) { // ok
+            i++;
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/InputEmptyForIteratorPadToCheckUppercaseFunctionInOptionProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/InputEmptyForIteratorPadToCheckUppercaseFunctionInOptionProperty.java
new file mode 100644
index 00000000000..ff5268630eb
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptyforiteratorpad/InputEmptyForIteratorPadToCheckUppercaseFunctionInOptionProperty.java
@@ -0,0 +1,28 @@
+/*
+EmptyForIteratorPad
+option = space
+
+
+*/
+
+package com.puppycrawl.tools.checkstyle.checks.whitespace.emptyforiteratorpad;
+
+public class InputEmptyForIteratorPadToCheckUppercaseFunctionInOptionProperty {
+
+    void method() {
+
+        for (int i = 0; i < 1;i++ ) {
+        }
+
+        for (int i = 0; i < 1; i++ ) {
+        }
+
+        for (int i = 0; i < 1;) { // violation '';' is not followed by whitespace'
+            i++;
+        }
+
+        for (int i = 0; i < 1; ) { // ok
+            i++;
+        }
+    }
+}