diff --git a/test/e2e/autoscaling/dns_autoscaling.go b/test/e2e/autoscaling/dns_autoscaling.go
index 98f9945245f..fe4c2f2d5fc 100644
--- a/test/e2e/autoscaling/dns_autoscaling.go
+++ b/test/e2e/autoscaling/dns_autoscaling.go
@@ -41,8 +41,8 @@ import (
 // Constants used in dns-autoscaling test.
 const (
 	DNSdefaultTimeout      = 5 * time.Minute
-	ClusterAddonLabelKey   = "k8s-app"
-	DNSLabelName           = "kube-dns"
+	ClusterAddonLabelKey   = "kubernetes.io/name"
+	DNSLabelName           = "KubeDNS"
 	DNSAutoscalerLabelName = "kube-dns-autoscaler"
 )
 
@@ -57,16 +57,19 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() {
 	var DNSParams3 DNSParamsLinear
 
 	ginkgo.BeforeEach(func(ctx context.Context) {
-		e2eskipper.SkipUnlessProviderIs("gce", "gke")
 		c = f.ClientSet
-
 		nodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
 		framework.ExpectNoError(err)
 		nodeCount := len(nodes.Items)
 
 		ginkgo.By("Collecting original replicas count and DNS scaling params")
 		originDNSReplicasCount, err = getDNSReplicas(ctx, c)
-		framework.ExpectNoError(err)
+		if err != nil {
+			if strings.Contains(err.Error(), "expected 1 DNS deployment") && originDNSReplicasCount == 0 {
+				e2eskipper.Skipf(err.Error())
+			}
+			framework.Failf("unexpected error: %v", err)
+		}
 
 		pcm, err := fetchDNSScalingConfigMap(ctx, c)
 		framework.ExpectNoError(err)
@@ -311,7 +314,7 @@ func getDNSReplicas(ctx context.Context, c clientset.Interface) (int, error) {
 		return 0, err
 	}
 	if len(deployments.Items) != 1 {
-		return 0, fmt.Errorf("expected 1 DNS deployment, got %v", len(deployments.Items))
+		return len(deployments.Items), fmt.Errorf("expected 1 DNS deployment, got %v", len(deployments.Items))
 	}
 
 	deployment := deployments.Items[0]