diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml
index 17570da445dd..fc79f49e9084 100644
--- a/codestyle/checkstyle.xml
+++ b/codestyle/checkstyle.xml
@@ -71,5 +71,10 @@
       <property name="illegalPattern" value="true"/>
       <property name="message" value="Use Comparators.naturalNullsFirst() instead of Ordering.natural().nullsFirst()"/>
     </module>
+    <module name="Regexp">
+      <property name="format" value="(Byte|Character|Short|Integer|Long|Float|Double)\.TYPE"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Use primitive.class instead. But check twice that you don't actually need BoxedPrimitive.class instead of BoxedPrimitive.TYPE"/>
+    </module>
   </module>
 </module>
diff --git a/processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java b/processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java
index fac3004b6e0c..a71223ad7fa2 100644
--- a/processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java
+++ b/processing/src/main/java/io/druid/segment/QueryableIndexStorageAdapter.java
@@ -669,7 +669,7 @@ public ObjectColumnSelector makeObjectColumnSelector(String column)
                             @Override
                             public Class classOfObject()
                             {
-                              return Float.TYPE;
+                              return Float.class;
                             }
 
                             @Override
@@ -685,7 +685,7 @@ public Float get()
                             @Override
                             public Class classOfObject()
                             {
-                              return Long.TYPE;
+                              return Long.class;
                             }
 
                             @Override
diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
index 7cea6d9be1f1..54e4f8f0ea95 100644
--- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
+++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
@@ -658,9 +658,9 @@ public Class getMetricClass(String metric)
       case COMPLEX:
         return ComplexMetrics.getSerdeForType(metricDesc.getType()).getObjectStrategy().getClazz();
       case FLOAT:
-        return Float.TYPE;
+        return Float.class;
       case LONG:
-        return Long.TYPE;
+        return Long.class;
       case STRING:
         return String.class;
     }
diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java
index 3a19b4797bf1..8c4681806f70 100644
--- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java
+++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java
@@ -547,7 +547,7 @@ public ObjectColumnSelector makeObjectColumnSelector(String column)
                     @Override
                     public Class classOfObject()
                     {
-                      return Long.TYPE;
+                      return Long.class;
                     }
 
                     @Override
diff --git a/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java b/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
index c838b61b12a8..f08de1e7e601 100644
--- a/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
+++ b/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
@@ -31,7 +31,7 @@ public static ObjectColumnSelector<Float> wrap(final FloatColumnSelector selecto
       @Override
       public Class<Float> classOfObject()
       {
-        return Float.TYPE;
+        return Float.class;
       }
 
       @Override
diff --git a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java b/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java
index 8449c3fd03e3..8ae10bd992c4 100644
--- a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java
+++ b/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexBenchmark.java
@@ -286,11 +286,11 @@ public void testConcurrentAddRead()
 
     final IncrementalIndex incrementalIndex = this.incrementalIndex.getConstructor(
         IncrementalIndexSchema.class,
-        Boolean.TYPE,
-        Boolean.TYPE,
-        Boolean.TYPE,
-        Boolean.TYPE,
-        Integer.TYPE
+        boolean.class,
+        boolean.class,
+        boolean.class,
+        boolean.class,
+        int.class
     ).newInstance(
         new IncrementalIndexSchema.Builder().withMetrics(factories).build(),
         true,