diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml
index 254ca3818f..00b501b875 100755
--- a/apm-checkstyle/checkStyle.xml
+++ b/apm-checkstyle/checkStyle.xml
@@ -82,7 +82,9 @@
         <module name="MethodTypeParameterName">
             <property name="format" value="(^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$)"/>
         </module>
-        <module name="PackageName"/>
+        <module name="PackageName">
+            <property name="format" value="^org\.apache\.skywalking(\.[a-zA-Z][a-zA-Z0-9]*)+$"/>
+        </module>
         <module name="ParameterName"/>
         <module name="StaticVariableName">
             <property name="format" value="(^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$)"/>
diff --git a/pom.xml b/pom.xml
index 57cb2ae02e..07bab626c9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -492,7 +492,10 @@
                     <consoleOutput>true</consoleOutput>
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
                     <failsOnError>true</failsOnError>
-                    <includes>org/apache/skywalking/**/*.java</includes>
+                    <sourceDirectories>
+                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                        <sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
+                    </sourceDirectories>
                     <resourceIncludes>
                         **/*.properties,
                         **/*.sh,