diff --git a/rest-api-spec/test/create/10_with_id.yaml b/rest-api-spec/test/create/10_with_id.yaml
index c33d6a5affa..2b31331bf53 100644
--- a/rest-api-spec/test/create/10_with_id.yaml
+++ b/rest-api-spec/test/create/10_with_id.yaml
@@ -10,7 +10,7 @@
  - is_true:   ok
  - match:   { _index:   test_1 }
  - match:   { _type:    test }
- - match:   { _id:      1}
+ - match:   { _id:      "1"}
  - match:   { _version: 1}
 
  - do:
@@ -21,7 +21,7 @@
 
  - match:   { _index:   test_1 }
  - match:   { _type:    test }
- - match:   { _id:      1}
+ - match:   { _id:      "1"}
  - match:   { _version: 1}
  - match:   { _source: { foo: bar }}
 
diff --git a/rest-api-spec/test/get/10_basic.yaml b/rest-api-spec/test/get/10_basic.yaml
index e6ec40aabe8..fe43fbbcd16 100644
--- a/rest-api-spec/test/get/10_basic.yaml
+++ b/rest-api-spec/test/get/10_basic.yaml
@@ -30,7 +30,7 @@
 
   - match: { _index:   test_1 }
   - match: { _type:    test   }
-  - match: { _id:      1      }
+  - match: { _id:      "1"      }
   - match: { _source:  { foo: bar } }
 
   - do:
@@ -40,5 +40,5 @@
 
   - match: { _index:   test_1 }
   - match: { _type:    test   }
-  - match: { _id:      1      }
+  - match: { _id:      "1"      }
   - match: { _source:  { foo: bar } }
diff --git a/rest-api-spec/test/get/20_fields.yaml b/rest-api-spec/test/get/20_fields.yaml
index d3c276fa494..6d85c5d86f5 100644
--- a/rest-api-spec/test/get/20_fields.yaml
+++ b/rest-api-spec/test/get/20_fields.yaml
@@ -16,7 +16,7 @@
 
   - match:   { _index:   test_1  }
   - match:   { _type:    test    }
-  - match:   { _id:      1       }
+  - match:   { _id:      "1"       }
   - match:   { fields.foo:  bar  }
   - is_false:  _source
 
diff --git a/rest-api-spec/test/get/30_parent.yaml b/rest-api-spec/test/get/30_parent.yaml
index e10aa4edf31..f4bbd94edde 100644
--- a/rest-api-spec/test/get/30_parent.yaml
+++ b/rest-api-spec/test/get/30_parent.yaml
@@ -28,9 +28,9 @@
           parent:  5
           fields:  [_parent, _routing]
 
- - match:   { _id:      1}
- - match:   { fields._parent: 5}
- - match:   { fields._routing: 5}
+ - match:   { _id:      "1"}
+ - match:   { fields._parent: "5"}
+ - match:   { fields._routing: "5"}
 
  - do:
       catch: missing
diff --git a/rest-api-spec/test/get/40_routing.yaml b/rest-api-spec/test/get/40_routing.yaml
index d3ede246816..2f935fbc66c 100644
--- a/rest-api-spec/test/get/40_routing.yaml
+++ b/rest-api-spec/test/get/40_routing.yaml
@@ -19,8 +19,8 @@
           routing: 5
           fields:  [_routing]
 
- - match:   { _id:              1}
- - match:   { fields._routing:  5}
+ - match:   { _id:              "1"}
+ - match:   { fields._routing:  "5"}
 
  - do:
       catch: missing
diff --git a/rest-api-spec/test/get/55_parent_with_routing.yaml b/rest-api-spec/test/get/55_parent_with_routing.yaml
index 10615e6b219..16e590b5a56 100644
--- a/rest-api-spec/test/get/55_parent_with_routing.yaml
+++ b/rest-api-spec/test/get/55_parent_with_routing.yaml
@@ -30,9 +30,9 @@
           routing: 4
           fields:  [_parent, _routing]
 
- - match:   { _id:      1}
- - match:   { fields._parent: 5}
- - match:   { fields._routing: 4}
+ - match:   { _id:      "1"}
+ - match:   { fields._parent: "5"}
+ - match:   { fields._routing: "4"}
 
  - do:
       catch: missing