diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 2933a762d7..fca8d304c4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -35,7 +35,7 @@
     <node.executable>node</node.executable>
     <nodeVersion>v0.12.2</nodeVersion>
     <npmVersion>2.10.0</npmVersion>
-    <skipTests>false</skipTests>
+    <keep-ui-build-cache>false</keep-ui-build-cache>
   </properties>
 
   <build>
@@ -60,19 +60,20 @@
       </plugin>
 
       <plugin>
-         <artifactId>maven-clean-plugin</artifactId>
-         <version>3.0.0</version>
-         <configuration>
-            <followSymLinks>false</followSymLinks>
-            <filesets>
-               <fileset>
-                  <directory>${basedir}/src/main/webapp/bower_components</directory>
-               </fileset>
-               <fileset>
-                  <directory>${basedir}/src/main/webapp/node_modules</directory>
-               </fileset>
-            </filesets>
-         </configuration>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <skip>${keep-ui-build-cache}</skip>
+          <followSymLinks>false</followSymLinks>
+          <filesets>
+            <fileset>
+              <directory>${basedir}/src/main/webapp/bower_components</directory>
+            </fileset>
+            <fileset>
+              <directory>${basedir}/src/main/webapp/node_modules</directory>
+            </fileset>
+          </filesets>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -125,21 +126,6 @@
                   </arguments>
                 </configuration>
               </execution>
-              <execution>
-                <phase>generate-sources</phase>
-                <id>bower --allow-root install</id>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <workingDirectory>${webappDir}</workingDirectory>
-                  <executable>bower</executable>
-                  <arguments>
-                    <argument>--allow-root</argument>
-                    <argument>install</argument>
-                  </arguments>
-                </configuration>
-              </execution>
               <execution>
                 <id>ember build</id>
                 <phase>generate-sources</phase>
@@ -157,21 +143,6 @@
                   </arguments>
                 </configuration>
               </execution>
-              <execution>
-                <id>ember test</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <skip>${skipTests}</skip>
-                  <workingDirectory>${webappDir}</workingDirectory>
-                  <executable>ember</executable>
-                  <arguments>
-                    <argument>test</argument>
-                  </arguments>
-                </configuration>
-              </execution>
               <execution>
                 <id>cleanup tmp</id>
                 <phase>generate-sources</phase>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index d21cc3e627..7736c759da 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function(defaults) {
   var app = new EmberApp(defaults, {
-    // Add options here
+    hinting: false
   });
 
   app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index baa473ad13..6a4eb16a18 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -9,8 +9,7 @@
   },
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
-    "test": "ember test"
+    "start": "ember server"
   },
   "repository": "",
   "engines": {