diff --git a/hack/.golint_failures b/hack/.golint_failures
index 95a0b7fb99b..5c13ecd4554 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -14,7 +14,6 @@ pkg/api/ref
 pkg/api/testapi
 pkg/api/testing
 pkg/api/testing/compat
-pkg/api/unversioned
 pkg/api/v1/endpoints
 pkg/api/v1/pod
 pkg/api/v1/resource
diff --git a/hack/lib/util.sh b/hack/lib/util.sh
index d88787be51d..e51b7c7eea8 100755
--- a/hack/lib/util.sh
+++ b/hack/lib/util.sh
@@ -275,9 +275,6 @@ kube::util::group-version-to-pkg-path() {
     meta/v1beta1)
       echo "vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1"
       ;;
-    unversioned)
-      echo "pkg/api/unversioned"
-      ;;
     *.k8s.io)
       echo "pkg/apis/${group_version%.*k8s.io}"
       ;;
diff --git a/hack/verify-description.sh b/hack/verify-description.sh
index 95bb0680031..79fc2f3bc69 100755
--- a/hack/verify-description.sh
+++ b/hack/verify-description.sh
@@ -49,7 +49,7 @@ find_files() {
 }
 
 if [[ $# -eq 0 ]]; then
-  versioned_api_files=$(find_files | egrep "pkg/.[^/]*/((v.[^/]*)|unversioned)/types\.go")
+  versioned_api_files=$(find_files | egrep "pkg/.[^/]*/((v.[^/]*)|unversioned)/types\.go") || true
 else
   versioned_api_files="${*}"
 fi
diff --git a/pkg/BUILD b/pkg/BUILD
index 037dbecae9d..b46fd1f6f66 100644
--- a/pkg/BUILD
+++ b/pkg/BUILD
@@ -22,7 +22,6 @@ filegroup(
         "//pkg/api/service:all-srcs",
         "//pkg/api/testapi:all-srcs",
         "//pkg/api/testing:all-srcs",
-        "//pkg/api/unversioned:all-srcs",
         "//pkg/api/v1/endpoints:all-srcs",
         "//pkg/api/v1/node:all-srcs",
         "//pkg/api/v1/pod:all-srcs",
diff --git a/test/integration/etcd/etcd_storage_path_test.go b/test/integration/etcd/etcd_storage_path_test.go
index 0df64905319..6be9ac3c617 100644
--- a/test/integration/etcd/etcd_storage_path_test.go
+++ b/test/integration/etcd/etcd_storage_path_test.go
@@ -537,7 +537,7 @@ var kindWhiteList = sets.NewString(
 	"WatchEvent",
 	// --
 
-	// k8s.io/kubernetes/pkg/api/unversioned
+	// k8s.io/apimachinery/pkg/apis/meta/v1
 	"Status",
 	// --
 )