diff --git a/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js b/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
index 63d113295520f..e63d2c52d59ef 100644
--- a/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
+++ b/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
@@ -36,8 +36,7 @@ module.exports = {
         },
         'id': {
           'type': 'integer',
-          'index': true,
-          'include_in_all': false
+          'index': true
         },
         'clientip': {
           'type': 'ip'
diff --git a/test/fixtures/scenarios/makelogs/makelogs_index_definition.js b/test/fixtures/scenarios/makelogs/makelogs_index_definition.js
index 63d113295520f..e63d2c52d59ef 100644
--- a/test/fixtures/scenarios/makelogs/makelogs_index_definition.js
+++ b/test/fixtures/scenarios/makelogs/makelogs_index_definition.js
@@ -36,8 +36,7 @@ module.exports = {
         },
         'id': {
           'type': 'integer',
-          'index': true,
-          'include_in_all': false
+          'index': true
         },
         'clientip': {
           'type': 'ip'
diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index 3a3b81f5a8b93..12e41a1a65d7b 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -323,7 +323,7 @@ bdd.describe('creating and using Painless date scripted fields', function descri
     await PageObjects.settings
       .addScriptedField(scriptedPainlessFieldName2, 'painless', 'date',
       { format: 'Date', datePattern: 'YYYY-MM-DD HH:00' }, '1',
-      'doc[\'utc_time\'].value + (1000) * 60 * 60');
+      'doc[\'utc_time\'].value.getMillis() + (1000) * 60 * 60');
     await PageObjects.common.try(async function() {
       expect(parseInt(await PageObjects.settings.getScriptedFieldsTabCount())).to.be(startingCount + 1);
     });