diff --git a/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt b/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt
index 688617708..509fdefa3 100644
--- a/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt
+++ b/spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/query/QueryExtensions.kt
@@ -25,7 +25,7 @@ package org.springframework.data.cassandra.core.query
 /**
  * Extension for [Query.query] providing a global query alias for an improved DSL.
  */
-fun query(criteria: Criteria): Query = Query.query(criteria)
+fun query(criteria: CriteriaDefinition): Query = Query.query(criteria)
 
 /**
  * Extension for [Query.query] providing a global query alias for an improved DSL.
diff --git a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt
index 983dad7ac..abd909252 100644
--- a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt
+++ b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/query/QueryExtensionsUnitTests.kt
@@ -25,6 +25,14 @@ import org.junit.Test
  */
 class QueryExtensionsUnitTests {
 
+	@Test
+	fun `should create query from single criteria`() {
+
+		val query = query(where("jedi").isEqualTo(true))
+
+		assertThat(query.toString()).contains("jedi = true")
+	}
+
 	@Test
 	fun `should create query from concatenated criteria`() {