diff --git a/rest-api-spec/test/update/10_doc.yaml b/rest-api-spec/test/update/10_doc.yaml
index a7b749a692f..0b013067714 100644
--- a/rest-api-spec/test/update/10_doc.yaml
+++ b/rest-api-spec/test/update/10_doc.yaml
@@ -40,7 +40,7 @@
 
   - match: { _index:   test_1 }
   - match: { _type:    test   }
-  - match: { _id:      1      }
+  - match: { _id:      "1"    }
   - match: { _version: 2      }
 
   - do:
diff --git a/rest-api-spec/test/update/15_script.yaml b/rest-api-spec/test/update/15_script.yaml
index cdcb9b892e5..5e298d7ef1a 100644
--- a/rest-api-spec/test/update/15_script.yaml
+++ b/rest-api-spec/test/update/15_script.yaml
@@ -43,7 +43,7 @@
 
   - match: { _index:   test_1 }
   - match: { _type:    test   }
-  - match: { _id:      1      }
+  - match: { _id:      "1"    }
   - match: { _version: 2      }
 
   - do:
@@ -65,7 +65,7 @@
 
   - match: { _index:   test_1 }
   - match: { _type:    test   }
-  - match: { _id:      1      }
+  - match: { _id:      "1"    }
   - match: { _version: 3      }
 
   - do:
diff --git a/rest-api-spec/test/update/40_routing.yaml b/rest-api-spec/test/update/40_routing.yaml
index c95c45b4ca7..d60acdf1a5d 100644
--- a/rest-api-spec/test/update/40_routing.yaml
+++ b/rest-api-spec/test/update/40_routing.yaml
@@ -19,7 +19,7 @@
           routing: 5
           fields:  _routing
 
- - match: { fields._routing:  5}
+ - match: { fields._routing:  "5"}
 
  - do:
       catch:      missing
diff --git a/rest-api-spec/test/update/50_parent.yaml b/rest-api-spec/test/update/50_parent.yaml
index 2f092490d6d..94cbceb5e13 100644
--- a/rest-api-spec/test/update/50_parent.yaml
+++ b/rest-api-spec/test/update/50_parent.yaml
@@ -40,8 +40,8 @@
           parent:  5
           fields:  [_parent, _routing]
 
- - match: { fields._parent:  5}
- - match: { fields._routing: 5}
+ - match: { fields._parent:  "5"}
+ - match: { fields._routing: "5"}
 
  - do:
       catch:      missing
diff --git a/rest-api-spec/test/update/55_parent_with_routing.yaml b/rest-api-spec/test/update/55_parent_with_routing.yaml
index 18d35d04552..1d0326c8715 100644
--- a/rest-api-spec/test/update/55_parent_with_routing.yaml
+++ b/rest-api-spec/test/update/55_parent_with_routing.yaml
@@ -32,8 +32,8 @@
           parent:  5
           fields:  [_parent, _routing]
 
- - match: { fields._parent:  5}
- - match: { fields._routing: 4}
+ - match: { fields._parent:  "5"}
+ - match: { fields._routing: "4"}
 
  - do:
       catch:      missing
diff --git a/rest-api-spec/test/update/85_fields_meta.yaml b/rest-api-spec/test/update/85_fields_meta.yaml
index acd6cfeadd9..aee463a603b 100644
--- a/rest-api-spec/test/update/85_fields_meta.yaml
+++ b/rest-api-spec/test/update/85_fields_meta.yaml
@@ -35,8 +35,8 @@
             doc:    { foo: baz }
             upsert: { foo: bar }
 
-  - match:   { get.fields._parent:  5 }
-  - match:   { get.fields._routing: 5 }
+  - match:   { get.fields._parent:  "5" }
+  - match:   { get.fields._routing: "5" }
   - is_true:   get.fields._timestamp
   - is_true:   get.fields._ttl