diff --git a/package.json b/package.json
index bdfdb7af6..f5e4a6144 100644
--- a/package.json
+++ b/package.json
@@ -63,31 +63,6 @@
     "type": "git",
     "url": "http://github.com/elasticsearch/elasticsearch-js.git"
   },
-  "testling": {
-    "scripts": [
-      "test/unit/angular-*.js"
-    ],
-    "files": [
-      "test/unit/test_!(file_logger|http_connector|stdio_logger|console_logger|stream_logger|tracer_logger|transport_with_server)*"
-    ],
-    "harness": "mocha",
-    "browsers": {
-      "firefox": [
-        24,
-        "nightly"
-      ],
-      "chrome": [
-        30,
-        "canary"
-      ],
-      "safari": [
-        5.1
-      ],
-      "opera": [
-        12
-      ]
-    }
-  },
   "scripts": {
     "test": "grunt test",
     "blanket": {
diff --git a/scripts/_utils.sh b/scripts/_utils.sh
index 03cf360b1..7dc6fde43 100644
--- a/scripts/_utils.sh
+++ b/scripts/_utils.sh
@@ -62,7 +62,7 @@ function manage_es {
         if [ ! -x "$ES_BIN" ]; then
           echo "Downloading Elasticsearch $ES_VERSION"
           call rm -rf ${SNAPSHOTS}/${ES_VERSION}*
-          call curl -#O $ES_URL
+          call curl --silent -O $ES_URL
           unzip -q elasticsearch-*.zip
           rm elasticsearch-*.zip
           mv elasticsearch-*/ $ES_DIR
diff --git a/test/angular_build_unit_tests.html b/test/angular_build_unit_tests.html
index 65ca1caa2..443329ae6 100644
--- a/test/angular_build_unit_tests.html
+++ b/test/angular_build_unit_tests.html
@@ -11,7 +11,7 @@
     <script>
       mocha.setup('bdd');
       mocha.checkLeaks();
-      mocha.globals(['mochaRunner']);
+      mocha.globals(['mochaRunner', 'angular']);
     </script>
     <script src="angular.js"></script>
     <script src="angular_build.js"></script>
diff --git a/test/utils/server/index.js b/test/utils/server/index.js
index 5731a6456..be696a4f8 100644
--- a/test/utils/server/index.js
+++ b/test/utils/server/index.js
@@ -6,14 +6,20 @@ var path = require('path');
 var root = path.join(__dirname, '../../..');
 var glob = require('glob');
 var browserify = require('browserify');
-
 var pkg = require(root + '/package.json');
+var testFiles = 'test/unit/test_!(' + [
+  'file_logger',
+  'http_connector',
+  'stdio_logger',
+  'console_logger',
+  'stream_logger',
+  'tracer_logger',
+  'transport_with_server',
+].join('') + ')*';
 
-var defaultFiles = _.transform(pkg.testling.files, function (files, pattern) {
-  [].push.apply(files, _.map(glob.sync(pattern), function (filename) {
-    return path.resolve(root, filename);
-  }));
-}, []);
+var defaultFiles = _.map(glob.sync(testFiles), function (filename) {
+  return path.resolve(root, filename);
+});
 
 var aliasify = require('aliasify').configure({
   aliases: pkg.browser,
@@ -23,12 +29,12 @@ var aliasify = require('aliasify').configure({
 });
 
 function browserBuild(name) {
+  var files = _.union(defaultFiles, [path.resolve(root, 'test/unit/browser_test_' + name + '_build.js')]);
+
   return function (req, res, next) {
     res.set('Content-Type', 'application/javascript');
 
-    var b = browserify(_.union(defaultFiles, [
-      path.resolve(root, 'test/unit/browser_test_' + name + '_build.js')
-    ]));
+    var b = browserify(files);
     b.transform(aliasify);
     b.bundle({
       insertGlobals: true