diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt
index 55811df5666..10ec6077e08 100755
--- a/test/conformance/testdata/conformance.txt
+++ b/test/conformance/testdata/conformance.txt
@@ -43,24 +43,24 @@ test/e2e/common/downwardapi_volume.go: "should provide container's cpu request "
 test/e2e/common/downwardapi_volume.go: "should provide container's memory request "
 test/e2e/common/downwardapi_volume.go: "should provide node allocatable (cpu) as default cpu limit if the limit is not set "
 test/e2e/common/downwardapi_volume.go: "should provide node allocatable (memory) as default memory limit if the limit is not set "
-test/e2e/common/empty_dir.go: "volume on tmpfs should have the correct mode  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (root,0644,tmpfs)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (root,0666,tmpfs)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (root,0777,tmpfs)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (non-root,0644,tmpfs)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (non-root,0666,tmpfs)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (non-root,0777,tmpfs)  [sig-storage]"
-test/e2e/common/empty_dir.go: "volume on default medium should have the correct mode  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (root,0644,default)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (root,0666,default)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (root,0777,default)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (non-root,0644,default)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (non-root,0666,default)  [sig-storage]"
-test/e2e/common/empty_dir.go: "should support (non-root,0777,default)  [sig-storage]"
+test/e2e/common/empty_dir.go: "volume on tmpfs should have the correct mode"
+test/e2e/common/empty_dir.go: "should support (root,0644,tmpfs)"
+test/e2e/common/empty_dir.go: "should support (root,0666,tmpfs)"
+test/e2e/common/empty_dir.go: "should support (root,0777,tmpfs)"
+test/e2e/common/empty_dir.go: "should support (non-root,0644,tmpfs)"
+test/e2e/common/empty_dir.go: "should support (non-root,0666,tmpfs)"
+test/e2e/common/empty_dir.go: "should support (non-root,0777,tmpfs)"
+test/e2e/common/empty_dir.go: "volume on default medium should have the correct mode"
+test/e2e/common/empty_dir.go: "should support (root,0644,default)"
+test/e2e/common/empty_dir.go: "should support (root,0666,default)"
+test/e2e/common/empty_dir.go: "should support (root,0777,default)"
+test/e2e/common/empty_dir.go: "should support (non-root,0644,default)"
+test/e2e/common/empty_dir.go: "should support (non-root,0666,default)"
+test/e2e/common/empty_dir.go: "should support (non-root,0777,default)"
 test/e2e/common/expansion.go: "should allow composing env vars into new env vars "
 test/e2e/common/expansion.go: "should allow substituting values in a container's command "
 test/e2e/common/expansion.go: "should allow substituting values in a container's args "
-test/e2e/common/host_path.go: "should give a volume the correct mode  [sig-storage]"
+test/e2e/common/host_path.go: "should give a volume the correct mode"
 test/e2e/common/kubelet_etc_hosts.go: "should test kubelet managed /etc/hosts file "
 test/e2e/common/networking.go: "should function for intra-pod communication: http "
 test/e2e/common/networking.go: "should function for intra-pod communication: udp "
@@ -71,34 +71,34 @@ test/e2e/common/pods.go: "should be submitted and removed "
 test/e2e/common/pods.go: "should be updated "
 test/e2e/common/pods.go: "should allow activeDeadlineSeconds to be updated "
 test/e2e/common/pods.go: "should contain environment variables for services "
-test/e2e/common/projected.go: "should be consumable from pods in volume  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume as non-root with defaultMode and fsGroup set  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume with mappings  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item Mode set  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable in multiple volumes in a pod  [sig-storage]"
-test/e2e/common/projected.go: "optional updates should be reflected in volume  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume as non-root  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume with mappings  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item mode set [sig-storage]"
-test/e2e/common/projected.go: "should be consumable from pods in volume with mappings as non-root  [sig-storage]"
-test/e2e/common/projected.go: "updates should be reflected in volume  [sig-storage]"
-test/e2e/common/projected.go: "optional updates should be reflected in volume  [sig-storage]"
-test/e2e/common/projected.go: "should be consumable in multiple volumes in the same pod  [sig-storage]"
-test/e2e/common/projected.go: "should provide podname only  [sig-storage]"
-test/e2e/common/projected.go: "should set DefaultMode on files  [sig-storage]"
-test/e2e/common/projected.go: "should set mode on item file  [sig-storage]"
-test/e2e/common/projected.go: "should update labels on modification  [sig-storage]"
-test/e2e/common/projected.go: "should update annotations on modification  [sig-storage]"
-test/e2e/common/projected.go: "should provide container's cpu limit  [sig-storage]"
-test/e2e/common/projected.go: "should provide container's memory limit  [sig-storage]"
-test/e2e/common/projected.go: "should provide container's cpu request  [sig-storage]"
-test/e2e/common/projected.go: "should provide container's memory request  [sig-storage]"
-test/e2e/common/projected.go: "should provide node allocatable (cpu) as default cpu limit if the limit is not set  [sig-storage]"
-test/e2e/common/projected.go: "should provide node allocatable (memory) as default memory limit if the limit is not set  [sig-storage]"
-test/e2e/common/projected.go: "should project all components that make up the projection API  [sig-storage] [Projection]"
+test/e2e/common/projected.go: "should be consumable from pods in volume"
+test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set"
+test/e2e/common/projected.go: "should be consumable from pods in volume as non-root with defaultMode and fsGroup set"
+test/e2e/common/projected.go: "should be consumable from pods in volume with mappings"
+test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item Mode set"
+test/e2e/common/projected.go: "should be consumable in multiple volumes in a pod"
+test/e2e/common/projected.go: "optional updates should be reflected in volume"
+test/e2e/common/projected.go: "should be consumable from pods in volume"
+test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set"
+test/e2e/common/projected.go: "should be consumable from pods in volume as non-root"
+test/e2e/common/projected.go: "should be consumable from pods in volume with mappings"
+test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item mode set"
+test/e2e/common/projected.go: "should be consumable from pods in volume with mappings as non-root"
+test/e2e/common/projected.go: "updates should be reflected in volume"
+test/e2e/common/projected.go: "optional updates should be reflected in volume"
+test/e2e/common/projected.go: "should be consumable in multiple volumes in the same pod"
+test/e2e/common/projected.go: "should provide podname only"
+test/e2e/common/projected.go: "should set DefaultMode on files"
+test/e2e/common/projected.go: "should set mode on item file"
+test/e2e/common/projected.go: "should update labels on modification"
+test/e2e/common/projected.go: "should update annotations on modification"
+test/e2e/common/projected.go: "should provide container's cpu limit"
+test/e2e/common/projected.go: "should provide container's memory limit"
+test/e2e/common/projected.go: "should provide container's cpu request"
+test/e2e/common/projected.go: "should provide container's memory request"
+test/e2e/common/projected.go: "should provide node allocatable (cpu) as default cpu limit if the limit is not set"
+test/e2e/common/projected.go: "should provide node allocatable (memory) as default memory limit if the limit is not set"
+test/e2e/common/projected.go: "should project all components that make up the projection API [Projection]"
 test/e2e/common/secrets.go: "should be consumable from pods in env vars "
 test/e2e/common/secrets.go: "should be consumable via the environment "
 test/e2e/common/secrets_volume.go: "should be consumable from pods in volume "