diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
index bd19431a5..778ccf37b 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
@@ -35,9 +35,9 @@ public class WhitespaceAroundCheck extends Check implements Java14TokenTypes
             NOT_EQUAL,         // "!="
             DIV,               // '/'
             DIV_ASSIGN,        // "/="
-            // PLUS,              //' +' TODO: unaray plus
+            PLUS,              //' +' (unaray plus is UNARY_PLUS)
             PLUS_ASSIGN,       // "+="
-            // MINUS,             // '-' TODO: unary minus
+            MINUS,             // '-' (unary minus is UNARY_MINUS)
             MINUS_ASSIGN,      //"-="
             STAR,              // '*'
             STAR_ASSIGN,       // "*="
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java
index 56c6916bc..b8905e10e 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java
@@ -36,12 +36,6 @@ public class WhitespaceAroundTest
         verifyMessage(msgs, idx++, 28, 10, "'+=' is not preceeded with whitespace.");
         verifyMessage(msgs, idx++, 28, 12, "'+=' is not followed by whitespace.");
         verifyMessage(msgs, idx++, 29, 13, "'-=' is not followed by whitespace.");
-        //verifyMessage(msgs, idx++, 29, 14, "'-' is followed by whitespace.");
-        //verifyMessage(msgs, idx++, 29, 21, "'+' is followed by whitespace.");
-        //verifyMessage(msgs, idx++, 30, 14, "'++' is preceeded with whitespace.");
-        //verifyMessage(msgs, idx++, 30, 21, "'--' is preceeded with whitespace.");
-        //verifyMessage(msgs, idx++, 31, 15, "'++' is followed by whitespace.");
-        //verifyMessage(msgs, idx++, 31, 22, "'--' is followed by whitespace.");
         verifyMessage(msgs, idx++, 37, 21, "'synchronized' is not followed by whitespace.");
         verifyMessage(msgs, idx++, 39, 12, "'try' is not followed by whitespace.");
         verifyMessage(msgs, idx++, 41, 14, "'catch' is not followed by whitespace.");