diff --git a/hack/.golint_failures b/hack/.golint_failures
index 812757f2d41..0c497cbacbf 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -546,7 +546,6 @@ staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder
 test/e2e/common
 test/e2e/lifecycle/bootstrap
 test/e2e/storage/vsphere
-test/e2e_kubeadm
 test/e2e_node
 test/e2e_node/remote
 test/e2e_node/runner/remote
diff --git a/test/e2e_kubeadm/bootstrap_signer.go b/test/e2e_kubeadm/bootstrap_signer.go
index 9b3f2eed429..412c54459aa 100644
--- a/test/e2e_kubeadm/bootstrap_signer.go
+++ b/test/e2e_kubeadm/bootstrap_signer.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -28,7 +28,7 @@ const (
 
 // Define container for all the test specification aimed at verifying
 // that kubeadm creates the bootstrap signer
-var _ = KubeadmDescribe("bootstrap signer", func() {
+var _ = Describe("bootstrap signer", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("bootstrap token")
diff --git a/test/e2e_kubeadm/bootstrap_token_test.go b/test/e2e_kubeadm/bootstrap_token_test.go
index 5320c229bcb..4e584074a09 100644
--- a/test/e2e_kubeadm/bootstrap_token_test.go
+++ b/test/e2e_kubeadm/bootstrap_token_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	corev1 "k8s.io/api/core/v1"
@@ -37,7 +37,7 @@ const (
 // Define container for all the test specification aimed at verifying
 // that kubeadm creates the bootstrap token, the system:bootstrappers:kubeadm:default-node-token group
 // and that all the related RBAC rules are in place
-var _ = KubeadmDescribe("bootstrap token", func() {
+var _ = Describe("bootstrap token", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("bootstrap token")
diff --git a/test/e2e_kubeadm/cluster_info_test.go b/test/e2e_kubeadm/cluster_info_test.go
index 78be6c214f6..ec182722740 100644
--- a/test/e2e_kubeadm/cluster_info_test.go
+++ b/test/e2e_kubeadm/cluster_info_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	authv1 "k8s.io/api/authorization/v1"
@@ -44,7 +44,7 @@ var (
 // Define container for all the test specification aimed at verifying
 // that kubeadm creates the cluster-info ConfigMap, that it is properly configured
 // and that all the related RBAC rules are in place
-var _ = KubeadmDescribe("cluster-info ConfigMap", func() {
+var _ = Describe("cluster-info ConfigMap", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("cluster-info")
diff --git a/test/e2e_kubeadm/const.go b/test/e2e_kubeadm/const.go
index 96960f81e47..554ef9b5a3c 100644
--- a/test/e2e_kubeadm/const.go
+++ b/test/e2e_kubeadm/const.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 const (
 	kubePublicNamespace = "kube-public"
diff --git a/test/e2e_kubeadm/controlplane_nodes_test.go b/test/e2e_kubeadm/controlplane_nodes_test.go
index c6ebb693818..f525422717e 100644
--- a/test/e2e_kubeadm/controlplane_nodes_test.go
+++ b/test/e2e_kubeadm/controlplane_nodes_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	corev1 "k8s.io/api/core/v1"
@@ -33,7 +33,7 @@ const (
 
 // Define container for all the test specification aimed at verifying
 // that kubeadm configures the control-plane node as expected
-var _ = KubeadmDescribe("control-plane node", func() {
+var _ = Describe("control-plane node", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("control-plane node")
diff --git a/test/e2e_kubeadm/dns_addon_test.go b/test/e2e_kubeadm/dns_addon_test.go
index d095a1532d3..c3a451f2cf1 100644
--- a/test/e2e_kubeadm/dns_addon_test.go
+++ b/test/e2e_kubeadm/dns_addon_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -43,7 +43,7 @@ var (
 
 // Define container for all the test specification aimed at verifying
 // that kubeadm configures the dns as expected
-var _ = KubeadmDescribe("DNS addon", func() {
+var _ = Describe("DNS addon", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("DNS")
diff --git a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go
index 9a508138f94..c2b23e1b3d3 100644
--- a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go
+++ b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	"flag"
diff --git a/test/e2e_kubeadm/framework.go b/test/e2e_kubeadm/framework.go
index f3312c5d4b2..50c8df82609 100644
--- a/test/e2e_kubeadm/framework.go
+++ b/test/e2e_kubeadm/framework.go
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import "k8s.io/kubernetes/test/e2e/framework"
 
-// KubeadmDescribe annotates the test with the Kubeadm label.
-func KubeadmDescribe(text string, body func()) bool {
+// Describe annotates the test with the Kubeadm label.
+func Describe(text string, body func()) bool {
 	return framework.KubeDescribe("[sig-cluster-lifecycle] [area-kubeadm] "+text, body)
 }
diff --git a/test/e2e_kubeadm/kubeadm_certs_test.go b/test/e2e_kubeadm/kubeadm_certs_test.go
index eeea604c68e..d6a66d15848 100644
--- a/test/e2e_kubeadm/kubeadm_certs_test.go
+++ b/test/e2e_kubeadm/kubeadm_certs_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	"fmt"
@@ -50,7 +50,7 @@ var (
 
 // Important! please note that kubeadm-certs is not created by default (still alpha)
 // in case you want to skip this test use SKIP=copy-certs
-var _ = KubeadmDescribe("kubeadm-certs [copy-certs]", func() {
+var _ = Describe("kubeadm-certs [copy-certs]", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("kubeadm-certs")
diff --git a/test/e2e_kubeadm/kubeadm_config_test.go b/test/e2e_kubeadm/kubeadm_config_test.go
index bd652bf9ba0..693e62b76c1 100644
--- a/test/e2e_kubeadm/kubeadm_config_test.go
+++ b/test/e2e_kubeadm/kubeadm_config_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	yaml "gopkg.in/yaml.v2"
@@ -47,7 +47,7 @@ var (
 // Define container for all the test specification aimed at verifying
 // that kubeadm creates the cluster-info ConfigMap, that it is properly configured
 // and that all the related RBAC rules are in place
-var _ = KubeadmDescribe("kubeadm-config ConfigMap", func() {
+var _ = Describe("kubeadm-config ConfigMap", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("kubeadm-config")
diff --git a/test/e2e_kubeadm/kubelet_config_test.go b/test/e2e_kubeadm/kubelet_config_test.go
index cba80956623..567af0c2f4e 100644
--- a/test/e2e_kubeadm/kubelet_config_test.go
+++ b/test/e2e_kubeadm/kubelet_config_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	"fmt"
@@ -48,7 +48,7 @@ var (
 // Define container for all the test specification aimed at verifying
 // that kubeadm creates the kubelet-config ConfigMap, that it is properly configured
 // and that all the related RBAC rules are in place
-var _ = KubeadmDescribe("kubelet-config ConfigMap", func() {
+var _ = Describe("kubelet-config ConfigMap", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("kubelet-config")
diff --git a/test/e2e_kubeadm/networking_test.go b/test/e2e_kubeadm/networking_test.go
index 1364b44a705..83557c2238b 100644
--- a/test/e2e_kubeadm/networking_test.go
+++ b/test/e2e_kubeadm/networking_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	"net"
@@ -35,7 +35,7 @@ var (
 // Define container for all the test specification aimed at verifying
 // that kubeadm configures the networking as expected.
 // in case you want to skip this test use SKIP=setup-networking
-var _ = KubeadmDescribe("networking [setup-networking]", func() {
+var _ = Describe("networking [setup-networking]", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("networking")
diff --git a/test/e2e_kubeadm/nodes_test.go b/test/e2e_kubeadm/nodes_test.go
index bf8ef80bf62..4a252e94762 100644
--- a/test/e2e_kubeadm/nodes_test.go
+++ b/test/e2e_kubeadm/nodes_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -34,7 +34,7 @@ const (
 
 // Define container for all the test specification aimed at verifying
 // that kubeadm configures the nodes and system:nodes group as expected
-var _ = KubeadmDescribe("nodes", func() {
+var _ = Describe("nodes", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("nodes")
diff --git a/test/e2e_kubeadm/proxy_addon_test.go b/test/e2e_kubeadm/proxy_addon_test.go
index ba2dbadc746..49494587700 100644
--- a/test/e2e_kubeadm/proxy_addon_test.go
+++ b/test/e2e_kubeadm/proxy_addon_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	authv1 "k8s.io/api/authorization/v1"
@@ -47,7 +47,7 @@ var (
 
 // Define container for all the test specification aimed at verifying
 // that kubeadm configures the proxy addon as expected
-var _ = KubeadmDescribe("proxy addon", func() {
+var _ = Describe("proxy addon", func() {
 
 	// Get an instance of the k8s test framework
 	f := framework.NewDefaultFramework("proxy")
diff --git a/test/e2e_kubeadm/util.go b/test/e2e_kubeadm/util.go
index 19ce05cb322..6a9fd3ba190 100644
--- a/test/e2e_kubeadm/util.go
+++ b/test/e2e_kubeadm/util.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e_kubeadm
+package kubeadm
 
 import (
 	appsv1 "k8s.io/api/apps/v1"