diff --git a/test/e2e/es_index_cleaner_test.go b/test/e2e/es_index_cleaner_test.go
index a7486f251..678e442ed 100644
--- a/test/e2e/es_index_cleaner_test.go
+++ b/test/e2e/es_index_cleaner_test.go
@@ -83,7 +83,7 @@ func esIndexCleanerTest(t *testing.T, f *framework.Framework, testCtx *framework
 		return err
 	}
 
-	esPod, err := GetPod("default", "elasticsearch", "elasticsearch", f.KubeClient)
+	esPod, err := GetPod(storageNamespace, "elasticsearch", "elasticsearch", f.KubeClient)
 	if err != nil {
 		return err
 	}
diff --git a/test/e2e/smoketest.go b/test/e2e/smoketest.go
index 8ed995470..80d7fa070 100644
--- a/test/e2e/smoketest.go
+++ b/test/e2e/smoketest.go
@@ -43,12 +43,10 @@ func SmokeTest(apiTracesEndpoint, collectorEndpoint, serviceName string, interva
 		bodyBytes, err := ioutil.ReadAll(resp.Body)
 		bodyString := string(bodyBytes)
 
+
 		if !strings.Contains(bodyString, "errors\":null") {
 			return false, errors.New("query service returns errors")
 		}
-		if !strings.Contains(bodyString, tStr) {
-			return false, errors.New("query service does not return spans")
-		}
-		return true, nil
+		return strings.Contains(bodyString, tStr), nil
 	})
 }