diff --git a/tests/scalers/elasticsearch/elasticsearch_test.go b/tests/scalers/elasticsearch/elasticsearch_test.go
index de2d997066c..a72a2f84c47 100644
--- a/tests/scalers/elasticsearch/elasticsearch_test.go
+++ b/tests/scalers/elasticsearch/elasticsearch_test.go
@@ -202,7 +202,7 @@ spec:
     name: elasticsearch
 `
 
-	scaledObjectTemplate = `
+	scaledObjectTemplateSearchTemplate = `
 apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
@@ -232,6 +232,40 @@ spec:
         name: keda-trigger-auth-elasticsearch-secret
 `
 
+	scaledObjectTemplateQuery = `
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+  name: {{.ScaledObjectName}}
+  namespace: {{.TestNamespace}}
+  labels:
+    app: {{.DeploymentName}}
+spec:
+  scaleTargetRef:
+    name: {{.DeploymentName}}
+  minReplicaCount: 0
+  maxReplicaCount: 2
+  pollingInterval: 3
+  cooldownPeriod:  5
+  triggers:
+    - type: elasticsearch
+      metadata:
+        addresses: "http://{{.DeploymentName}}.{{.TestNamespace}}.svc:9200"
+        username: "elastic"
+        index: {{.IndexName}}
+        query: |
+          {
+            "query": {
+              "match_all": {}
+            }
+          }
+        valueLocation: "hits.total.value"
+        targetValue: "1"
+        activationTargetValue: "4"
+      authenticationRef:
+        name: keda-trigger-auth-elasticsearch-secret
+`
+
 	elasticsearchCreateIndex = `
 {
   "mappings": {
@@ -297,9 +331,6 @@ spec:
 func TestElasticsearchScaler(t *testing.T) {
 	kc := GetKubernetesClient(t)
 	data, templates := getTemplateData()
-	t.Cleanup(func() {
-		DeleteKubernetesResources(t, testNamespace, data, templates)
-	})
 
 	// Create kubernetes resources
 	CreateKubernetesResources(t, kc, testNamespace, data, templates)
@@ -307,13 +338,32 @@ func TestElasticsearchScaler(t *testing.T) {
 	// setup elastic
 	setupElasticsearch(t, kc)
 
-	assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
-		"replica count should be %d after 3 minutes", minReplicaCount)
+	t.Run("test with searchTemplateName", func(t *testing.T) {
+		t.Log("--- testing with searchTemplateName ---")
+
+		// Create ScaledObject with searchTemplateName
+		KubectlApplyWithTemplate(t, data, "scaledObjectTemplateSearchTemplate", scaledObjectTemplateSearchTemplate)
 
-	// test scaling
-	testActivation(t, kc)
-	testScaleOut(t, kc)
-	testScaleIn(t, kc)
+		testElasticsearchScaler(t, kc)
+
+		// Delete ScaledObject
+		KubectlDeleteWithTemplate(t, data, "scaledObjectTemplateSearchTemplate", scaledObjectTemplateSearchTemplate)
+	})
+
+	t.Run("test with query", func(t *testing.T) {
+		t.Log("--- testing with query ---")
+
+		// Create ScaledObject with query
+		KubectlApplyWithTemplate(t, data, "scaledObjectTemplateQuery", scaledObjectTemplateQuery)
+
+		testElasticsearchScaler(t, kc)
+
+		// Delete ScaledObject
+		KubectlDeleteWithTemplate(t, data, "scaledObjectTemplateQuery", scaledObjectTemplateQuery)
+	})
+
+	// cleanup
+	DeleteKubernetesResources(t, testNamespace, data, templates)
 }
 
 func setupElasticsearch(t *testing.T, kc *kubernetes.Clientset) {
@@ -326,22 +376,18 @@ func setupElasticsearch(t *testing.T, kc *kubernetes.Clientset) {
 	require.NoErrorf(t, err, "cannot execute command - %s", err)
 }
 
-func testActivation(t *testing.T, kc *kubernetes.Clientset) {
+func testElasticsearchScaler(t *testing.T, kc *kubernetes.Clientset) {
 	t.Log("--- testing activation ---")
 	addElements(t, 3)
 
 	AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60)
-}
 
-func testScaleOut(t *testing.T, kc *kubernetes.Clientset) {
 	t.Log("--- testing scale out ---")
 	addElements(t, 5)
 
 	assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3),
 		"replica count should be %d after 3 minutes", maxReplicaCount)
-}
 
-func testScaleIn(t *testing.T, kc *kubernetes.Clientset) {
 	t.Log("--- testing scale in ---")
 
 	assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
@@ -383,6 +429,5 @@ func getTemplateData() (templateData, []Template) {
 			{Name: "serviceTemplate", Config: serviceTemplate},
 			{Name: "elasticsearchDeploymentTemplate", Config: elasticsearchDeploymentTemplate},
 			{Name: "deploymentTemplate", Config: deploymentTemplate},
-			{Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
 		}
 }