diff --git a/core/modules/views/config/schema/views.data_types.schema.yml b/core/modules/views/config/schema/views.data_types.schema.yml
index 60aefbc..a9cf79b 100644
--- a/core/modules/views/config/schema/views.data_types.schema.yml
+++ b/core/modules/views/config/schema/views.data_types.schema.yml
@@ -800,6 +800,10 @@ views_relationship:
       type: boolean
       label: 'Require this relationship'
 
+views_query:
+  type: mapping
+  label: 'Query options'
+
 views_row:
   type: mapping
   label: 'Row options'
diff --git a/core/modules/views/config/schema/views.query.schema.yml b/core/modules/views/config/schema/views.query.schema.yml
index 1b3dc94..8bab8d2 100644
--- a/core/modules/views/config/schema/views.query.schema.yml
+++ b/core/modules/views/config/schema/views.query.schema.yml
@@ -1,7 +1,7 @@
 # Schema for the views query.
 
 views.query.views_query:
-  type: mapping
+  type: views_query
   label: 'Views query'
   mapping:
     query_comment:
diff --git a/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml b/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml
index 97867d3..59b5670 100644
--- a/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml
+++ b/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml
@@ -63,7 +63,7 @@ views.display.display_no_area_test:
   label: 'Test display options without areas'
 
 views.query.query_test:
-  type: mapping
+  type: views_query
   label: 'Views query test options'
   mapping:
     test_setting: