diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
index 495ceba4b..83142eb44 100644
--- a/config/checkstyle_sevntu_checks.xml
+++ b/config/checkstyle_sevntu_checks.xml
@@ -103,5 +103,6 @@
             <property name="highlightAllDuplicates" value="true"/>
         </module>
         <module name="SimpleAccessorNameNotation"/>
+        <module name="ForbidWildcardAsReturnType"/>
     </module>
 </module>
diff --git a/config/sevntu_suppressions.xml b/config/sevntu_suppressions.xml
index ac4f54799..c90f3c65c 100644
--- a/config/sevntu_suppressions.xml
+++ b/config/sevntu_suppressions.xml
@@ -20,4 +20,17 @@
     <suppress checks="SimpleAccessorNameNotation"
               files="ClassFanOutComplexityCheck\.java"
               lines="76"/>
+
+    <!-- These classes are deprecated and will be removed soon. -->
+    <suppress checks="ForbidWildcardAsReturnType"
+              files="AbstractTypeAwareCheck\.java"
+              lines="223,239,419"/>
+    <suppress checks="ForbidWildcardAsReturnType"
+              files="ClassResolver\.java"
+              lines="72,184"/>
+    <!-- We need to satisfy javax.swing.table.AbstractTableModel
+    public Class<?> getColumnClass(int columnIndex) { -->
+    <suppress checks="ForbidWildcardAsReturnType"
+              files="ParseTreeTableModel\.java"
+              lines="106"/>
 </suppressions>
\ No newline at end of file
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
index b0d960c34..786c31c67 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/HandlerFactory.java
@@ -85,9 +85,10 @@ public class HandlerFactory {
      *                type from TokenTypes
      * @param handlerClass
      *                the handler to register
+     * @param <T> type of the handler class object.
      */
-    private void register(int type, Class<?> handlerClass) {
-        final Constructor<?> ctor = CommonUtils.getConstructor(handlerClass,
+    private <T> void register(int type, Class<T> handlerClass) {
+        final Constructor<T> ctor = CommonUtils.getConstructor(handlerClass,
                 IndentationCheck.class,
                 // current AST
                 DetailAST.class,
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtils.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtils.java
index 44bb5c175..546642158 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtils.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/CommonUtils.java
@@ -289,10 +289,12 @@ public final class CommonUtils {
      *            from which constructor is returned
      * @param parameterTypes
      *            of constructor
+     * @param <T> type of the target class object.
      * @return constructor of targetClass or {@link IllegalStateException} if any exception occurs
      * @see Class#getConstructor(Class[])
      */
-    public static Constructor<?> getConstructor(Class<?> targetClass, Class<?>... parameterTypes) {
+    public static <T> Constructor<T> getConstructor(Class<T> targetClass,
+                                                    Class<?>... parameterTypes) {
         try {
             return targetClass.getConstructor(parameterTypes);
         }