diff --git a/asterixdb/asterix-app/src/test/resources/logging.properties b/asterixdb/asterix-app/src/test/resources/logging.properties
index 1253c5e..5b5e3b6 100644
--- a/asterixdb/asterix-app/src/test/resources/logging.properties
+++ b/asterixdb/asterix-app/src/test/resources/logging.properties
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 ############################################################
-#  	Default Logging Configuration File
+#      Default Logging Configuration File
 #
 # You can use a different file by specifying a filename
 # with the java.util.logging.config.file system property.  
@@ -24,7 +24,7 @@
 ############################################################
 
 ############################################################
-#  	Global properties
+#      Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler 
diff --git a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/logging.properties b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/logging.properties
index e3c448c..c297232 100644
--- a/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/logging.properties
+++ b/asterixdb/asterix-experiments/src/main/resources/ingestion-experiment-binary-and-configs/logging.properties
@@ -13,7 +13,7 @@
 # limitations under the License.
 #*/
 ############################################################
-#  	Default Logging Configuration File
+#      Default Logging Configuration File
 #
 # You can use a different file by specifying a filename
 # with the java.util.logging.config.file system property.  
@@ -21,7 +21,7 @@
 ############################################################
 
 ############################################################
-#  	Global properties
+#      Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler 
diff --git a/asterixdb/asterix-tools/src/test/resources/logging.properties b/asterixdb/asterix-tools/src/test/resources/logging.properties
index 33415ca..1d1bbda 100644
--- a/asterixdb/asterix-tools/src/test/resources/logging.properties
+++ b/asterixdb/asterix-tools/src/test/resources/logging.properties
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 ############################################################
-#  	Default Logging Configuration File
+#      Default Logging Configuration File
 #
 # You can use a different file by specifying a filename
 # with the java.util.logging.config.file system property.  
@@ -24,7 +24,7 @@
 ############################################################
 
 ############################################################
-#  	Global properties
+#      Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler 
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index ee0a277..7c5e3e7 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -216,6 +216,31 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <executions>
+          <execution>
+            <id>verify-style</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <logViolationsToConsole>true</logViolationsToConsole>
+          <checkstyleRules>
+            <module name="Checker">
+              <!-- Checks for whitespace                               -->
+              <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+              <module name="FileTabCharacter"/>
+            </module>
+          </checkstyleRules>
+          <sourceDirectories>${project.build.sourceDirectory},${project.build.testSourceDirectory}</sourceDirectories>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index abf710e..8fd0502 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -281,6 +281,31 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <executions>
+          <execution>
+            <id>verify-style</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <logViolationsToConsole>true</logViolationsToConsole>
+          <checkstyleRules>
+            <module name="Checker">
+              <!-- Checks for whitespace                               -->
+              <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+              <module name="FileTabCharacter"/>
+            </module>
+          </checkstyleRules>
+          <sourceDirectories>${project.build.sourceDirectory},${project.build.testSourceDirectory}</sourceDirectories>
+        </configuration>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>