diff --git a/tests/meson.build b/tests/meson.build
index f5f34b2b5..28d637204 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -180,14 +180,6 @@ tests = [
 			input_timestamps_unstable_v1_protocol_c,
 		],
 	},
-	{
-		'name': 'kiosk-shell',
-		'sources': [
-			'kiosk-shell-test.c',
-			xdg_shell_client_protocol_h,
-			xdg_shell_protocol_c,
-		],
-        },
 	{
 		'name': 'linux-explicit-synchronization',
 		'sources': [
@@ -427,6 +419,19 @@ if get_option('shell-ivi')
 	]
 endif
 
+if get_option('shell-kiosk')
+	tests += [
+		{
+			'name': 'kiosk-shell',
+			'sources': [
+				'kiosk-shell-test.c',
+				xdg_shell_client_protocol_h,
+				xdg_shell_protocol_c,
+			],
+		},
+	]
+endif
+
 test_config_h = configuration_data()
 test_config_h.set_quoted('WESTON_TEST_REFERENCE_PATH', meson.current_source_dir() + '/reference')
 test_config_h.set_quoted('WESTON_MODULE_MAP', env_modmap)