diff --git a/Gruntfile.js b/Gruntfile.js
index 356fa458f8..242f3459f1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -110,6 +110,7 @@ grunt.loadNpmTasks( "grunt-jscs-checker" );
 grunt.loadNpmTasks( "grunt-html" );
 grunt.loadNpmTasks( "grunt-compare-size" );
 grunt.loadNpmTasks( "grunt-git-authors" );
+grunt.loadNpmTasks( "grunt-esformatter" );
 // local testswarm and build tasks
 grunt.loadTasks( "build/tasks" );
 
@@ -202,6 +203,21 @@ grunt.initConfig({
 				csslintrc: ".csslintrc"
 			}
 		}
+	},
+
+	esformatter: {
+		options: {
+			preset: "jquery"
+		},
+		ui: "ui/*.js",
+		tests: "tests/unit/**/*.js",
+		build: {
+			options: {
+				skipHashbang: true
+			},
+			src: "build/**/*.js"
+		},
+		grunt: "Gruntfile.js"
 	}
 });
 
diff --git a/package.json b/package.json
index a802617b18..1f3732deda 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
 		"grunt-jscs-checker": "0.2.0",
 		"grunt-html": "0.3.3",
 		"grunt-git-authors": "1.2.0",
+		"grunt-esformatter": "0.2.0",
 		"rimraf": "2.1.4",
 		"testswarm": "1.1.0"
 	},