diff --git a/rest-api-spec/test/mget/10_basic.yaml b/rest-api-spec/test/mget/10_basic.yaml
index f6f7c34907b..adbf0b26a87 100644
--- a/rest-api-spec/test/mget/10_basic.yaml
+++ b/rest-api-spec/test/mget/10_basic.yaml
@@ -26,21 +26,21 @@
   - is_false: docs.0.exists
   - match:  { docs.0._index:     test_2      }
   - match:  { docs.0._type:      test        }
-  - match:  { docs.0._id:        1           }
+  - match:  { docs.0._id:        "1"         }
 
   - is_false: docs.1.exists
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      none        }
-  - match:  { docs.1._id:        1           }
+  - match:  { docs.1._id:        "1"         }
 
   - is_false: docs.2.exists
   - match:  { docs.2._index:     test_1      }
   - match:  { docs.2._type:      test        }
-  - match:  { docs.2._id:        2           }
+  - match:  { docs.2._id:        "2"         }
 
   - is_true:  docs.3.exists
   - match:  { docs.3._index:     test_1      }
   - match:  { docs.3._type:      test        }
-  - match:  { docs.3._id:        1           }
+  - match:  { docs.3._id:        "1"         }
   - match:  { docs.3._version:   1           }
   - match:  { docs.3._source:    { foo: bar }}
diff --git a/rest-api-spec/test/mget/11_default_index_type.yaml b/rest-api-spec/test/mget/11_default_index_type.yaml
index 07369f8567c..50901592db8 100644
--- a/rest-api-spec/test/mget/11_default_index_type.yaml
+++ b/rest-api-spec/test/mget/11_default_index_type.yaml
@@ -28,21 +28,21 @@
   - is_false: docs.0.exists
   - match:  { docs.0._index:     test_2      }
   - match:  { docs.0._type:      test        }
-  - match:  { docs.0._id:        1           }
+  - match:  { docs.0._id:        "1"         }
 
   - is_false: docs.1.exists
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      none        }
-  - match:  { docs.1._id:        1           }
+  - match:  { docs.1._id:        "1"         }
 
   - is_false: docs.2.exists
   - match:  { docs.2._index:     test_1      }
   - match:  { docs.2._type:      test        }
-  - match:  { docs.2._id:        2           }
+  - match:  { docs.2._id:        "2"         }
 
   - is_true:  docs.3.exists
   - match:  { docs.3._index:     test_1      }
   - match:  { docs.3._type:      test        }
-  - match:  { docs.3._id:        1           }
+  - match:  { docs.3._id:        "1"         }
   - match:  { docs.3._version:   1           }
   - match:  { docs.3._source:    { foo: bar }}
diff --git a/rest-api-spec/test/mget/12_non_existent_index.yaml b/rest-api-spec/test/mget/12_non_existent_index.yaml
index 59ab25520ba..4a987e4e6f6 100644
--- a/rest-api-spec/test/mget/12_non_existent_index.yaml
+++ b/rest-api-spec/test/mget/12_non_existent_index.yaml
@@ -24,7 +24,7 @@
   - is_false: docs.0.exists
   - match:  { docs.0._index:     test_2      }
   - match:  { docs.0._type:      test        }
-  - match:  { docs.0._id:        1           }
+  - match:  { docs.0._id:        "1"         }
 
   - do:
       mget:
@@ -36,5 +36,5 @@
   - is_true:  docs.0.exists
   - match:  { docs.0._index:     test_1      }
   - match:  { docs.0._type:      test        }
-  - match:  { docs.0._id:        1           }
+  - match:  { docs.0._id:        "1"         }
 
diff --git a/rest-api-spec/test/mget/13_missing_metadata.yaml b/rest-api-spec/test/mget/13_missing_metadata.yaml
index 8a03e6cfd5a..fde4102e3dd 100644
--- a/rest-api-spec/test/mget/13_missing_metadata.yaml
+++ b/rest-api-spec/test/mget/13_missing_metadata.yaml
@@ -46,7 +46,7 @@
   - is_true: docs.0.exists
   - match: { docs.0._index:     test_1      }
   - match: { docs.0._type:      test        }
-  - match: { docs.0._id:        1           }
+  - match: { docs.0._id:        "1"         }
   - match: { docs.0._version:   1           }
   - match: { docs.0._source:    { foo: bar }}
 
diff --git a/rest-api-spec/test/mget/15_ids.yaml b/rest-api-spec/test/mget/15_ids.yaml
index 040ccb61ce5..69a2fab727c 100644
--- a/rest-api-spec/test/mget/15_ids.yaml
+++ b/rest-api-spec/test/mget/15_ids.yaml
@@ -28,14 +28,14 @@
   - is_true:  docs.0.exists
   - match:  { docs.0._index:     test_1      }
   - match:  { docs.0._type:      test        }
-  - match:  { docs.0._id:        1           }
+  - match:  { docs.0._id:        "1"         }
   - match:  { docs.0._version:   1           }
   - match:  { docs.0._source:    { foo: bar }}
 
   - is_false: docs.1.exists
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      test        }
-  - match:  { docs.1._id:        2           }
+  - match:  { docs.1._id:        "2"         }
 
   - do:
       mget:
@@ -46,14 +46,14 @@
   - is_true:  docs.0.exists
   - match:  { docs.0._index:     test_1      }
   - match:  { docs.0._type:      test        }
-  - match:  { docs.0._id:        1           }
+  - match:  { docs.0._id:        "1"         }
   - match:  { docs.0._version:   1           }
   - match:  { docs.0._source:    { foo: bar }}
 
   - is_true:  docs.1.exists
   - match:  { docs.1._index:     test_1      }
   - match:  { docs.1._type:      test_2      }
-  - match:  { docs.1._id:        2           }
+  - match:  { docs.1._id:        "2"         }
   - match:  { docs.1._version:   1           }
   - match:  { docs.1._source:    { foo: baz }}
 
diff --git a/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml b/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml
index cdec1a33739..070cb1b8056 100644
--- a/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml
+++ b/rest-api-spec/test/mget/20_fields_pre_0.90.3.yaml
@@ -2,7 +2,7 @@
 "Fields":
 
   - skip:
-      version:  "0.90.3- 999"
+      version:  "0.90.3 - 999"
       reason:   "Tests pre 0.90.2 for single string fields"
 
   - do:
diff --git a/rest-api-spec/test/mget/30_parent.yaml b/rest-api-spec/test/mget/30_parent.yaml
index 3040f256adb..69c3b3eefe7 100644
--- a/rest-api-spec/test/mget/30_parent.yaml
+++ b/rest-api-spec/test/mget/30_parent.yaml
@@ -49,14 +49,14 @@
  - is_true:   docs.2.exists
  - match:   { docs.2._index:          test_1 }
  - match:   { docs.2._type:           test   }
- - match:   { docs.2._id:             1      }
- - match:   { docs.2.fields._parent:  4      }
- - match:   { docs.2.fields._routing: 4      }
+ - match:   { docs.2._id:             "1"    }
+ - match:   { docs.2.fields._parent:  "4"    }
+ - match:   { docs.2.fields._routing: "4"    }
 
  - is_true:   docs.3.exists
  - match:   { docs.3._index:          test_1 }
  - match:   { docs.3._type:           test   }
- - match:   { docs.3._id:             2      }
- - match:   { docs.3.fields._parent:  5      }
- - match:   { docs.3.fields._routing: 5      }
+ - match:   { docs.3._id:             "2"    }
+ - match:   { docs.3.fields._parent:  "5"    }
+ - match:   { docs.3.fields._routing: "5"    }
 
diff --git a/rest-api-spec/test/mget/40_routing.yaml b/rest-api-spec/test/mget/40_routing.yaml
index ee340355efd..9a1687214e8 100644
--- a/rest-api-spec/test/mget/40_routing.yaml
+++ b/rest-api-spec/test/mget/40_routing.yaml
@@ -28,5 +28,5 @@
  - is_true:   docs.2.exists
  - match:   { docs.2._index:          test_1 }
  - match:   { docs.2._type:           test   }
- - match:   { docs.2._id:             1      }
- - match:   { docs.2.fields._routing: 5      }
+ - match:   { docs.2._id:             "1"    }
+ - match:   { docs.2.fields._routing: "5"    }
diff --git a/rest-api-spec/test/mget/55_parent_with_routing.yaml b/rest-api-spec/test/mget/55_parent_with_routing.yaml
index 8613058dc84..7c029c40aff 100644
--- a/rest-api-spec/test/mget/55_parent_with_routing.yaml
+++ b/rest-api-spec/test/mget/55_parent_with_routing.yaml
@@ -41,7 +41,7 @@
  - is_true:   docs.2.exists
  - match:   { docs.2._index:          test_1 }
  - match:   { docs.2._type:           test   }
- - match:   { docs.2._id:             1      }
- - match:   { docs.2.fields._parent:  4      }
- - match:   { docs.2.fields._routing: 5      }
+ - match:   { docs.2._id:             "1"    }
+ - match:   { docs.2.fields._parent:  "4"    }
+ - match:   { docs.2.fields._routing: "5"    }