diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
index 1f9628fb58..22f003ec97 100644
--- a/android-interop-testing/build.gradle
+++ b/android-interop-testing/build.gradle
@@ -24,7 +24,7 @@ subprojects {
     apply plugin: "checkstyle"
 
     checkstyle {
-        configFile = file("$rootDir/../checkstyle.xml")
+        configFile = file("$rootDir/../buildscripts/checkstyle.xml")
         toolVersion = "6.17"
         ignoreFailures = false
         if (rootProject.hasProperty("checkstyle.ignoreFailures")) {
diff --git a/build.gradle b/build.gradle
index e2106d8abe..5f54ca9eb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -239,7 +239,7 @@ subprojects {
     }
 
     checkstyle {
-        configFile = file("$rootDir/checkstyle.xml")
+        configFile = file("$rootDir/buildscripts/checkstyle.xml")
         toolVersion = "6.17"
         ignoreFailures = false
         if (rootProject.hasProperty("checkstyle.ignoreFailures")) {
diff --git a/checkstyle.license b/buildscripts/checkstyle.license
similarity index 100%
rename from checkstyle.license
rename to buildscripts/checkstyle.license
diff --git a/checkstyle.xml b/buildscripts/checkstyle.xml
similarity index 99%
rename from checkstyle.xml
rename to buildscripts/checkstyle.xml
index 4da20ac87c..aed89da46b 100644
--- a/checkstyle.xml
+++ b/buildscripts/checkstyle.xml
@@ -21,7 +21,7 @@
     <property name="severity" value="error"/>
 
     <module name="Header">
-      <property name="headerFile" value="${rootDir}/checkstyle.license"/>
+      <property name="headerFile" value="${rootDir}/buildscripts/checkstyle.license"/>
       <property name="ignoreLines" value="2"/>
       <property name="fileExtensions" value="java"/>
     </module>