diff --git a/test/validator/samples/a11y-interactive-supports-focus/input.svelte b/test/validator/samples/a11y-interactive-supports-focus/input.svelte
index 8603fb9ff2..9caa9ccfaf 100644
--- a/test/validator/samples/a11y-interactive-supports-focus/input.svelte
+++ b/test/validator/samples/a11y-interactive-supports-focus/input.svelte
@@ -10,3 +10,23 @@
 <!-- INVALID -->
 <div role="button" on:keypress={() => {}} />
 <span role="menuitem" on:keydown={() => {}} />
+<div role="button" on:keyup={() => {}} />
+<span role="menuitem" on:click={() => {}} on:keypress={() => {}} />
+<div role="button" on:contextmenu={() => {}} />
+<span role="menuitem" on:dblclick={() => {}} />
+<div role="button" on:drag={() => {}} />
+<span role="menuitem" on:dragend={() => {}} />
+<div role="button" on:dragenter={() => {}} />
+<span role="menuitem" on:dragexit={() => {}} />
+<div role="button" on:dragleave={() => {}} />
+<span role="menuitem" on:dragover={() => {}} />
+<div role="button" on:dragstart={() => {}} />
+<span role="menuitem" on:drop={() => {}} />
+<div role="button" on:mousedown={() => {}} />
+<span role="menuitem" on:mouseenter={() => {}} />
+<div role="button" on:mouseleave={() => {}} />
+<span role="menuitem" on:mousemove={() => {}} />
+<div role="button" on:mouseout={() => {}} />
+<span role="menuitem" on:mouseover={() => {}} />
+<div role="button" on:mouseup={() => {}} />
+
diff --git a/test/validator/samples/a11y-interactive-supports-focus/warnings.json b/test/validator/samples/a11y-interactive-supports-focus/warnings.json
index 686593faa0..41586b064b 100644
--- a/test/validator/samples/a11y-interactive-supports-focus/warnings.json
+++ b/test/validator/samples/a11y-interactive-supports-focus/warnings.json
@@ -1,6 +1,6 @@
 [
 	{
-		"code": "a11y-no-noninteractive-element-interactions",
+		"code": "a11y-interactive-supports-focus",
 		"end": {
 			"column": 44,
 			"line": 11
@@ -12,7 +12,7 @@
 		}
 	},
 	{
-		"code": "a11y-no-noninteractive-element-interactions",
+		"code": "a11y-interactive-supports-focus",
 		"end": {
 			"column": 46,
 			"line": 12
@@ -22,5 +22,257 @@
 			"column": 0,
 			"line": 12
 		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 41,
+			"line": 13
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 13
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 67,
+			"line": 14
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 14
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 15
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 15
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 16
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 16
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 40,
+			"line": 17
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 17
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 46,
+			"line": 18
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 18
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 19
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 19
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 20
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 20
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 21
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 21
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 22
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 22
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 23
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 23
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 43,
+			"line": 24
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 24
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 25
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 25
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 49,
+			"line": 26
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 26
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 46,
+			"line": 27
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 27
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 48,
+			"line": 28
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 28
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 44,
+			"line": 29
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 29
+		}
+	},
+	{
+		"code": "a11y-mouse-events-have-key-events",
+		"end": {
+			"column": 44,
+			"line": 29
+		},
+		"message": "A11y: on:mouseout must be accompanied by on:blur",
+		"start": {
+			"column": 0,
+			"line": 29
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 48,
+			"line": 30
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 30
+		}
+	},
+	{
+		"code": "a11y-mouse-events-have-key-events",
+		"end": {
+			"column": 48,
+			"line": 30
+		},
+		"message": "A11y: on:mouseover must be accompanied by on:focus",
+		"start": {
+			"column": 0,
+			"line": 30
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 43,
+			"line": 31
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 31
+		}
 	}
 ]