diff --git a/package.json b/package.json
index 16c573ca6..a23486453 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "load-grunt-tasks": "~0.2.0",
     "load-grunt-config": "~0.7.0",
     "grunt-s3": "~0.2.0-alpha.3",
-    "grunt-run": "~0.1.12",
+    "grunt-run": "*",
     "relative-fs": "0.0.1",
     "grunt-contrib-compress": "~0.5.3",
     "grunt-contrib-copy": "~0.4.1",
diff --git a/src/elasticsearch b/src/elasticsearch
index ae3e8beca..1bd9dc129 160000
--- a/src/elasticsearch
+++ b/src/elasticsearch
@@ -1 +1 @@
-Subproject commit ae3e8beca4c61388d9f1798d1063fde7cf9ad1b0
+Subproject commit 1bd9dc129bb1beafd2101dd6f8ac2fe87444b578
diff --git a/test/integration/yaml_suite/yaml_doc.js b/test/integration/yaml_suite/yaml_doc.js
index a63c307f7..7b8bcdad8 100644
--- a/test/integration/yaml_suite/yaml_doc.js
+++ b/test/integration/yaml_suite/yaml_doc.js
@@ -260,6 +260,9 @@ YamlDoc.prototype = {
    * @param done
    */
   do_skip: function (args, done) {
+    if (!args.version) {
+      return done();
+    }
     rangeMatchesCurrentVersion(args.version, _.bind(function (match) {
       if (match) {
         if (this.description === 'setup') {
@@ -416,10 +419,18 @@ YamlDoc.prototype = {
    */
   do_match: function (args) {
     _.forOwn(args, function (val, path) {
-      if (val[0] === '$') {
-        val = this.get(val);
+      var isRef = _.isString(val) && val[0] === '$';
+      var isRE = _.isString(val) && val[0] === '/' && path[path.length - 1] === '/';
+
+      if (isRef) {
+        val = this.get(val === '$body' ? '' : val);
+      } else if (isRE) {
+        val = new RegExp(val);
+      } else {
+        val = this.get(path);
       }
-      expect(this.get(path)).to.eql(val, 'path: ' + path);
+
+      var assert = expect(val).to[isRE ? 'match' : 'eql'](val, 'path: ' + path);
     }, this);
   },