diff --git a/e2e/visual/fixtures/empty.json b/e2e/visual/fixtures/empty.json
index 33f16810a..a3af70379 100644
--- a/e2e/visual/fixtures/empty.json
+++ b/e2e/visual/fixtures/empty.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../packages/form-json-schema/resources/schema.json",
   "schemaVersion": 8,
   "exporter": {
     "name": "Camunda Web Modeler",
diff --git a/e2e/visual/fixtures/form.json b/e2e/visual/fixtures/form.json
index 0adcd9e59..ea7d92557 100644
--- a/e2e/visual/fixtures/form.json
+++ b/e2e/visual/fixtures/form.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../packages/form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "creditor",
@@ -132,13 +133,11 @@
       "type": "image"
     },
     {
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/e2e/visual/fixtures/groups.json b/e2e/visual/fixtures/groups.json
index 51d7061ba..5af65ff9d 100644
--- a/e2e/visual/fixtures/groups.json
+++ b/e2e/visual/fixtures/groups.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../packages/form-json-schema/resources/schema.json",
   "schemaVersion": 11,
   "exporter": {
     "name": "Camunda Web Modeler",
diff --git a/packages/form-js-carbon-styles/test/spec/complex.json b/packages/form-js-carbon-styles/test/spec/complex.json
index 8536a545b..678ed45c0 100644
--- a/packages/form-js-carbon-styles/test/spec/complex.json
+++ b/packages/form-js-carbon-styles/test/spec/complex.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "text": "# Title 1\n## Title 2\n### Title 3\n#### Title 4\n##### Title 5\n###### Title 6\n\n[this is a link](https://camunda.com) and then comes [**another bold link**](https://bpmn.io) and then [_another italic link_](https://camunda.com)\n\n- list\n- list\n\n1. foo\n2. foo\n\nFoo _italic_ **bold**\n\n> Multiline code\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus auctor sodales pretium. Donec id volutpat quam, sit amet elementum lectus. \n\nInline `code`\n\n```\nMultiline code\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus auctor sodales pretium. Donec id volutpat quam, sit amet elementum lectus. \n```\n\n[Link](https://camunda.com)\n",
@@ -60,7 +61,7 @@
       "label": "I am a read only textfield",
       "type": "textfield",
       "id": "Field_1r9b6p3",
-      "key": "readonly-textfield",
+      "key": "readonly_textfield",
       "description": "I am a read only textfield description",
       "readonly": true,
       "defaultValue": "value"
@@ -613,15 +614,13 @@
       "action": "reset",
       "label": "reset",
       "type": "button",
-      "id": "Field_1ydujqw",
-      "key": "field_1yi6q4r"
+      "id": "Field_1ydujqw"
     },
     {
       "action": "submit",
       "label": "submit",
       "type": "button",
-      "id": "Field_1ydujqa",
-      "key": "field_1yi6q4a"
+      "id": "Field_1ydujqa"
     }
   ],
   "type": "default",
diff --git a/packages/form-js-editor/test/spec/complex.json b/packages/form-js-editor/test/spec/complex.json
index 341c3c6f0..1e62652a1 100644
--- a/packages/form-js-editor/test/spec/complex.json
+++ b/packages/form-js-editor/test/spec/complex.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "columns",
diff --git a/packages/form-js-editor/test/spec/core/FormLayoutValidator.form.json b/packages/form-js-editor/test/spec/core/FormLayoutValidator.form.json
index 17addf337..2aa44b969 100644
--- a/packages/form-js-editor/test/spec/core/FormLayoutValidator.form.json
+++ b/packages/form-js-editor/test/spec/core/FormLayoutValidator.form.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "id": "Textfield_1",
diff --git a/packages/form-js-editor/test/spec/defaultValues.json b/packages/form-js-editor/test/spec/defaultValues.json
index 5e83f2289..c01a9618a 100644
--- a/packages/form-js-editor/test/spec/defaultValues.json
+++ b/packages/form-js-editor/test/spec/defaultValues.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
@@ -83,13 +84,11 @@
       ]
     },
     {
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js b/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js
index 3560f3e13..fe53a9a8a 100644
--- a/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js
+++ b/packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js
@@ -282,7 +282,7 @@ describe('properties panel', function() {
       it('entries', function() {
 
         // given
-        const field = schema.components.find(({ key }) => key === 'submit');
+        const field = schema.components.find(({ action }) => action === 'submit');
 
         const result = createPropertiesPanel({
           container,
diff --git a/packages/form-js-editor/test/spec/form-no-ids.json b/packages/form-js-editor/test/spec/form-no-ids.json
index 2a25b0a20..cea27a234 100644
--- a/packages/form-js-editor/test/spec/form-no-ids.json
+++ b/packages/form-js-editor/test/spec/form-no-ids.json
@@ -1,5 +1,6 @@
 
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
@@ -147,14 +148,12 @@
       ]
     },
     {
-      "key": "submit",
       "action": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-editor/test/spec/form-rows.json b/packages/form-js-editor/test/spec/form-rows.json
index a55e6b3b9..6b269b01e 100644
--- a/packages/form-js-editor/test/spec/form-rows.json
+++ b/packages/form-js-editor/test/spec/form-rows.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "id": "Textfield_1",
diff --git a/packages/form-js-editor/test/spec/form.json b/packages/form-js-editor/test/spec/form.json
index 067eda3d3..1e388254e 100644
--- a/packages/form-js-editor/test/spec/form.json
+++ b/packages/form-js-editor/test/spec/form.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "id": "Form_1",
   "type": "default",
   "components": [
@@ -209,14 +210,12 @@
     {
       "id": "Button_1",
       "action": "submit",
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "id": "Button_2",
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-editor/test/spec/other.json b/packages/form-js-editor/test/spec/other.json
index 666d5744a..6bfd8144f 100644
--- a/packages/form-js-editor/test/spec/other.json
+++ b/packages/form-js-editor/test/spec/other.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
@@ -22,7 +23,6 @@
       }
     },
     {
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     }
diff --git a/packages/form-js-editor/test/spec/redundantValues.json b/packages/form-js-editor/test/spec/redundantValues.json
index a6d611baf..2de87da0d 100644
--- a/packages/form-js-editor/test/spec/redundantValues.json
+++ b/packages/form-js-editor/test/spec/redundantValues.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "redundantValues",
diff --git a/packages/form-js-playground/test/spec/form.json b/packages/form-js-playground/test/spec/form.json
index 2181435c5..70caeb4f5 100644
--- a/packages/form-js-playground/test/spec/form.json
+++ b/packages/form-js-playground/test/spec/form.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
@@ -55,6 +56,7 @@
     },
     {
       "type": "select",
+      "key": "selectMe",
       "label": "Select me",
       "valuesExpression": "=if isGood then [ \"good\" ] else [\"bad\"]"
     },
diff --git a/packages/form-js-playground/test/spec/other-form.json b/packages/form-js-playground/test/spec/other-form.json
index e5d8f8f14..778c816bc 100644
--- a/packages/form-js-playground/test/spec/other-form.json
+++ b/packages/form-js-playground/test/spec/other-form.json
@@ -1,9 +1,9 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "action": "reset",
       "id": "foo",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-playground/test/spec/rows-form.json b/packages/form-js-playground/test/spec/rows-form.json
index b6bf8dbf0..e119ac580 100644
--- a/packages/form-js-playground/test/spec/rows-form.json
+++ b/packages/form-js-playground/test/spec/rows-form.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "invoiceNumber",
diff --git a/packages/form-js-viewer/test/spec/appearance.json b/packages/form-js-viewer/test/spec/appearance.json
index fe10d5764..0c2c594f7 100644
--- a/packages/form-js-viewer/test/spec/appearance.json
+++ b/packages/form-js-viewer/test/spec/appearance.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "textfield",
diff --git a/packages/form-js-viewer/test/spec/complex-conditions.json b/packages/form-js-viewer/test/spec/complex-conditions.json
index 2e2014a9d..bcd666e94 100644
--- a/packages/form-js-viewer/test/spec/complex-conditions.json
+++ b/packages/form-js-viewer/test/spec/complex-conditions.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "label": "Complex display condition 1",
diff --git a/packages/form-js-viewer/test/spec/condition-errors.json b/packages/form-js-viewer/test/spec/condition-errors.json
index 8ec5ea215..87c57a49b 100644
--- a/packages/form-js-viewer/test/spec/condition-errors.json
+++ b/packages/form-js-viewer/test/spec/condition-errors.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "label": "Checkbox",
diff --git a/packages/form-js-viewer/test/spec/condition-external-variable.json b/packages/form-js-viewer/test/spec/condition-external-variable.json
index f49408047..2a2c5bb4c 100644
--- a/packages/form-js-viewer/test/spec/condition-external-variable.json
+++ b/packages/form-js-viewer/test/spec/condition-external-variable.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "amount",
@@ -14,6 +15,7 @@
     },
     {
       "label": "Text Field",
+      "key": "textfield",
       "type": "textfield",
       "id": "Field",
       "conditional": {
diff --git a/packages/form-js-viewer/test/spec/condition.json b/packages/form-js-viewer/test/spec/condition.json
index 8b52a0650..0836d859e 100644
--- a/packages/form-js-viewer/test/spec/condition.json
+++ b/packages/form-js-viewer/test/spec/condition.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "amount",
diff --git a/packages/form-js-viewer/test/spec/defaultValues.json b/packages/form-js-viewer/test/spec/defaultValues.json
index 9b5080ecc..bea0cd1f0 100644
--- a/packages/form-js-viewer/test/spec/defaultValues.json
+++ b/packages/form-js-viewer/test/spec/defaultValues.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
@@ -154,13 +155,11 @@
       ]
     },
     {
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-viewer/test/spec/descriptions.json b/packages/form-js-viewer/test/spec/descriptions.json
index 145f00388..5a6257fcb 100644
--- a/packages/form-js-viewer/test/spec/descriptions.json
+++ b/packages/form-js-viewer/test/spec/descriptions.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "textfield",
diff --git a/packages/form-js-viewer/test/spec/disabled.json b/packages/form-js-viewer/test/spec/disabled.json
index f2e185242..cbf829b9b 100644
--- a/packages/form-js-viewer/test/spec/disabled.json
+++ b/packages/form-js-viewer/test/spec/disabled.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "disabled": true,
@@ -39,13 +40,11 @@
       "type": "textarea"
     },
     {
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-viewer/test/spec/dynamic.json b/packages/form-js-viewer/test/spec/dynamic.json
index 9aae9b880..85e3ef697 100644
--- a/packages/form-js-viewer/test/spec/dynamic.json
+++ b/packages/form-js-viewer/test/spec/dynamic.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "product",
diff --git a/packages/form-js-viewer/test/spec/expression-external-variable.json b/packages/form-js-viewer/test/spec/expression-external-variable.json
index 8793e01a0..343f8649e 100644
--- a/packages/form-js-viewer/test/spec/expression-external-variable.json
+++ b/packages/form-js-viewer/test/spec/expression-external-variable.json
@@ -1,17 +1,15 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
-      "label": "An image",
       "source": "=logo",
       "type": "image"
     },
     {
-      "label": "An image with alt text",
       "alt": "=alt",
       "type": "image"
     },
     {
-      "label": "Another image",
       "alt": "This is just an image",
       "type": "image"
     },
diff --git a/packages/form-js-viewer/test/spec/focusables.json b/packages/form-js-viewer/test/spec/focusables.json
index c42949ad0..d033bcdb1 100644
--- a/packages/form-js-viewer/test/spec/focusables.json
+++ b/packages/form-js-viewer/test/spec/focusables.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "label": "Number",
diff --git a/packages/form-js-viewer/test/spec/form.json b/packages/form-js-viewer/test/spec/form.json
index 224d35afd..ccd049c8a 100644
--- a/packages/form-js-viewer/test/spec/form.json
+++ b/packages/form-js-viewer/test/spec/form.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
@@ -137,13 +138,11 @@
       "type": "image"
     },
     {
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-viewer/test/spec/groups.json b/packages/form-js-viewer/test/spec/groups.json
index 859eb4aaa..5e3b30e44 100644
--- a/packages/form-js-viewer/test/spec/groups.json
+++ b/packages/form-js-viewer/test/spec/groups.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "text_root",
diff --git a/packages/form-js-viewer/test/spec/hidden-fields-conditional.json b/packages/form-js-viewer/test/spec/hidden-fields-conditional.json
index a363d1509..f3e97c207 100644
--- a/packages/form-js-viewer/test/spec/hidden-fields-conditional.json
+++ b/packages/form-js-viewer/test/spec/hidden-fields-conditional.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "label": "a",
diff --git a/packages/form-js-viewer/test/spec/hidden-fields-expression.json b/packages/form-js-viewer/test/spec/hidden-fields-expression.json
index b6db9e120..422e9d548 100644
--- a/packages/form-js-viewer/test/spec/hidden-fields-expression.json
+++ b/packages/form-js-viewer/test/spec/hidden-fields-expression.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "label": "a",
diff --git a/packages/form-js-viewer/test/spec/images.json b/packages/form-js-viewer/test/spec/images.json
index a0ba94ab6..099455d0d 100644
--- a/packages/form-js-viewer/test/spec/images.json
+++ b/packages/form-js-viewer/test/spec/images.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "source": "=logo_expression",
diff --git a/packages/form-js-viewer/test/spec/labels.json b/packages/form-js-viewer/test/spec/labels.json
index 24f0528a6..cd1968325 100644
--- a/packages/form-js-viewer/test/spec/labels.json
+++ b/packages/form-js-viewer/test/spec/labels.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "textfield",
diff --git a/packages/form-js-viewer/test/spec/other.json b/packages/form-js-viewer/test/spec/other.json
index 666d5744a..6bfd8144f 100644
--- a/packages/form-js-viewer/test/spec/other.json
+++ b/packages/form-js-viewer/test/spec/other.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
@@ -22,7 +23,6 @@
       }
     },
     {
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     }
diff --git a/packages/form-js-viewer/test/spec/readonly-expression.json b/packages/form-js-viewer/test/spec/readonly-expression.json
index 32f5a55d7..484957d3d 100644
--- a/packages/form-js-viewer/test/spec/readonly-expression.json
+++ b/packages/form-js-viewer/test/spec/readonly-expression.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "amount",
diff --git a/packages/form-js-viewer/test/spec/rows.json b/packages/form-js-viewer/test/spec/rows.json
index 69a5f40df..5fbd54048 100644
--- a/packages/form-js-viewer/test/spec/rows.json
+++ b/packages/form-js-viewer/test/spec/rows.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "id": "Textfield_1",
diff --git a/packages/form-js-viewer/test/spec/ships-example.json b/packages/form-js-viewer/test/spec/ships-example.json
index fa721e0b4..5f53868f4 100644
--- a/packages/form-js-viewer/test/spec/ships-example.json
+++ b/packages/form-js-viewer/test/spec/ships-example.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "text": "#### Ship Name:\n {{shipsForSale[item.name = selectedShip].name}}\n#### Ship Description: \n {{shipsForSale[item.name = selectedShip].description}}\n#### Ship Price: \n {{shipsForSale[item.name = selectedShip].purchasePrice}}\n#### Frame:\n {{shipsForSale[item.name = selectedShip].frame.name}}\n#### Reactor:\n {{shipsForSale[item.name = selectedShip].reactor.name}}\n#### Engine:\n {{shipsForSale[item.name = selectedShip].engine.name}}\n#### Moduels:\n {{shipsForSale[item.name = selectedShip].modules.name}}\n",
diff --git a/packages/form-js-viewer/test/spec/stress.json b/packages/form-js-viewer/test/spec/stress.json
index 757c3bd65..0fc7b5d77 100644
--- a/packages/form-js-viewer/test/spec/stress.json
+++ b/packages/form-js-viewer/test/spec/stress.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "id": "Form_1",
   "type": "default",
   "components": [
@@ -19,14 +20,12 @@
     {
       "id": "Field_11",
       "action": "submit",
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "id": "Field_12",
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }
diff --git a/packages/form-js-viewer/test/spec/template-variable-complex.json b/packages/form-js-viewer/test/spec/template-variable-complex.json
index 69a3d088d..d6ea896ca 100644
--- a/packages/form-js-viewer/test/spec/template-variable-complex.json
+++ b/packages/form-js-viewer/test/spec/template-variable-complex.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "text": "ConditionalExample: {{#if value > minimum}} Display conditionally {{display.subdisplay}} {{/if}}",
diff --git a/packages/form-js-viewer/test/spec/template-variable.json b/packages/form-js-viewer/test/spec/template-variable.json
index 91302b137..dcde6ffd2 100644
--- a/packages/form-js-viewer/test/spec/template-variable.json
+++ b/packages/form-js-viewer/test/spec/template-variable.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "text": "=myText",
diff --git a/packages/form-js-viewer/test/spec/text-template.json b/packages/form-js-viewer/test/spec/text-template.json
index 0886909bb..9043146c2 100644
--- a/packages/form-js-viewer/test/spec/text-template.json
+++ b/packages/form-js-viewer/test/spec/text-template.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "type": "text",
diff --git a/packages/form-js-viewer/test/spec/text.json b/packages/form-js-viewer/test/spec/text.json
index 955a32cfa..54b1d3781 100644
--- a/packages/form-js-viewer/test/spec/text.json
+++ b/packages/form-js-viewer/test/spec/text.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "schemaVersion": 1,
   "exporter": {
     "name": "form-js (https://demo.bpmn.io)",
diff --git a/packages/form-js-viewer/test/spec/util/GetSchemaVariables.spec.js b/packages/form-js-viewer/test/spec/util/GetSchemaVariables.spec.js
index d910bd6d6..1a5bb8c25 100644
--- a/packages/form-js-viewer/test/spec/util/GetSchemaVariables.spec.js
+++ b/packages/form-js-viewer/test/spec/util/GetSchemaVariables.spec.js
@@ -65,7 +65,7 @@ describe('util/getSchemaVariables', () => {
 
     const variables = getSchemaVariables(conditionalSchema);
 
-    expect(variables).to.eql([ 'externalVariable', 'amount' ]);
+    expect(variables).to.eql([ 'externalVariable', 'amount', 'textfield' ]);
   });
 
 
@@ -73,7 +73,7 @@ describe('util/getSchemaVariables', () => {
 
     const variables = getSchemaVariables(conditionalSchema, { inputs: false });
 
-    expect(variables).to.eql([ 'amount' ]);
+    expect(variables).to.eql([ 'amount', 'textfield' ]);
   });
 
 
diff --git a/packages/form-js-viewer/test/spec/validate.json b/packages/form-js-viewer/test/spec/validate.json
index f73f79284..68e0c29d8 100644
--- a/packages/form-js-viewer/test/spec/validate.json
+++ b/packages/form-js-viewer/test/spec/validate.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "number_expression",
diff --git a/packages/form-js-viewer/test/spec/valuesExpression.json b/packages/form-js-viewer/test/spec/valuesExpression.json
index ad9304424..924d6e65c 100644
--- a/packages/form-js-viewer/test/spec/valuesExpression.json
+++ b/packages/form-js-viewer/test/spec/valuesExpression.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "components": [
     {
       "key": "product",
diff --git a/packages/form-js/test/spec/form.json b/packages/form-js/test/spec/form.json
index 14d51e75a..f4885188c 100644
--- a/packages/form-js/test/spec/form.json
+++ b/packages/form-js/test/spec/form.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "../../../form-json-schema/resources/schema.json",
   "id": "Form_1",
   "type": "default",
   "components": [
@@ -178,14 +179,12 @@
     {
       "id": "Field_13",
       "action": "submit",
-      "key": "submit",
       "label": "Submit",
       "type": "button"
     },
     {
       "id": "Field_14",
       "action": "reset",
-      "key": "reset",
       "label": "Reset",
       "type": "button"
     }