diff --git a/maven/core-unittests/checkstyle.xml b/maven/core-unittests/checkstyle.xml
index 0a98b313aa..4251ce653b 100644
--- a/maven/core-unittests/checkstyle.xml
+++ b/maven/core-unittests/checkstyle.xml
@@ -16,7 +16,10 @@
             <property name="tabWidth" value="4"/>
         </module>
         <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyConstructors" value="true"/>
+        </module>
         <module name="LeftCurly"/>
         <module name="RightCurly"/>
     </module>
diff --git a/maven/core-unittests/pom.xml b/maven/core-unittests/pom.xml
index 28d4621ef4..7871f8bcea 100644
--- a/maven/core-unittests/pom.xml
+++ b/maven/core-unittests/pom.xml
@@ -121,7 +121,7 @@
                     <consoleOutput>false</consoleOutput>
                     <failsOnError>false</failsOnError>
                     <linkXRef>false</linkXRef>
-                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                    <includeTestSourceDirectory>false</includeTestSourceDirectory>
                     <outputFile>${project.build.directory}/checkstyle-result.xml</outputFile>
                     <outputFileFormat>xml</outputFileFormat>
                     <sourceDirectories>