diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt
index ace1d894f54..26cb4dd64e5 100644
--- a/test/conformance/testdata/conformance.txt
+++ b/test/conformance/testdata/conformance.txt
@@ -241,9 +241,11 @@ test/e2e/kubectl/kubectl.go: "should support --unix-socket=/path"
 test/e2e/network/dns.go: "should provide DNS for the cluster"
 test/e2e/network/dns.go: "should provide /etc/hosts entries for the cluster"
 test/e2e/network/dns.go: "should provide DNS for services"
+test/e2e/network/dns.go: "should resolve DNS of partial qualified names for services"
 test/e2e/network/dns.go: "should provide DNS for pods for Hostname"
 test/e2e/network/dns.go: "should provide DNS for pods for Subdomain"
 test/e2e/network/dns.go: "should provide DNS for ExternalName services"
+test/e2e/network/dns.go: "should support configurable pod DNS nameservers"
 test/e2e/network/proxy.go: "should proxy logs on node with explicit kubelet port using proxy subresource"
 test/e2e/network/proxy.go: "should proxy logs on node using proxy subresource"
 test/e2e/network/proxy.go: "should proxy through a service and a pod"
diff --git a/test/e2e/network/dns.go b/test/e2e/network/dns.go
index 0fe340c7d72..2c297f73688 100644
--- a/test/e2e/network/dns.go
+++ b/test/e2e/network/dns.go
@@ -86,7 +86,6 @@ var _ = SIGDescribe("DNS", func() {
 	// [LinuxOnly]: As Windows currently does not support resolving PQDNs.
 	ginkgo.It("should resolve DNS of partial qualified names for the cluster [LinuxOnly]", func() {
 		// All the names we need to be able to resolve.
-		// TODO: Spin up a separate test service and test that dns works for that service.
 		namesToResolve := []string{
 			"kubernetes.default",
 			"kubernetes.default.svc",
@@ -180,8 +179,13 @@ var _ = SIGDescribe("DNS", func() {
 		validateDNSResults(f, pod, append(wheezyFileNames, jessieFileNames...))
 	})
 
-	// [LinuxOnly]: As Windows currently does not support resolving PQDNs.
-	ginkgo.It("should resolve DNS of partial qualified names for services [LinuxOnly]", func() {
+	/*
+		Release: v1.17
+		Testname: DNS, PQDN for services
+		Description: Create a headless service and normal service. Both the services MUST be able to resolve partial qualified DNS entries of their service endpoints by serving A records and SRV records.
+		[LinuxOnly]: As Windows currently does not support resolving PQDNs.
+	*/
+	framework.ConformanceIt("should resolve DNS of partial qualified names for services [LinuxOnly]", func() {
 		// Create a test headless service.
 		ginkgo.By("Creating a test headless service")
 		testServiceSelector := map[string]string{
@@ -207,7 +211,6 @@ var _ = SIGDescribe("DNS", func() {
 		}()
 
 		// All the names we need to be able to resolve.
-		// TODO: Create more endpoints and ensure that multiple A records are returned
 		// for headless service.
 		namesToResolve := []string{
 			fmt.Sprintf("%s", headlessService.Name),
@@ -394,7 +397,13 @@ var _ = SIGDescribe("DNS", func() {
 		validateTargetedProbeOutput(f, pod3, []string{wheezyFileName, jessieFileName}, svc.Spec.ClusterIP)
 	})
 
-	ginkgo.It("should support configurable pod DNS nameservers", func() {
+	/*
+		Release: v1.17
+		Testname: DNS, custom dnsConfig
+		Description: Create a Pod with DNSPolicy as None and custom DNS configuration, specifying nameservers and search path entries.
+		Pod creation MUST be successful and provided DNS configuration MUST be configured in the Pod.
+	*/
+	framework.ConformanceIt("should support configurable pod DNS nameservers", func() {
 		ginkgo.By("Creating a pod with dnsPolicy=None and customized dnsConfig...")
 		testServerIP := "1.1.1.1"
 		testSearchPath := "resolv.conf.local"