diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go
index 589a44b8080..df25d849b1c 100644
--- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go
+++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go
@@ -19,7 +19,6 @@ package testgroup
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/api"
 )
 
 var SchemeGroupVersion = schema.GroupVersion{Group: "testgroup.k8s.io", Version: runtime.APIVersionInternal}
diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go
index 834160138cb..a45ec3f3bd6 100644
--- a/pkg/api/serialization_test.go
+++ b/pkg/api/serialization_test.go
@@ -180,6 +180,8 @@ var nonRoundTrippableTypes = sets.NewString(
 	// the schema by content type, rather than via kind/version included in each
 	// object.
 	"WatchEvent",
+	// ListOptions is now part of the meta group
+	"ListOptions",
 )
 
 var commonKinds = []string{"Status", "ListOptions", "DeleteOptions", "ExportOptions"}
diff --git a/pkg/master/import_known_versions_test.go b/pkg/master/import_known_versions_test.go
index 588eb47bc00..9fd797d2b37 100644
--- a/pkg/master/import_known_versions_test.go
+++ b/pkg/master/import_known_versions_test.go
@@ -81,6 +81,7 @@ var typesAllowedTags = map[reflect.Type]bool{
 	reflect.TypeOf(metav1.LabelSelector{}):  true,
 	reflect.TypeOf(metav1.GetOptions{}):     true,
 	reflect.TypeOf(metav1.ExportOptions{}):  true,
+	reflect.TypeOf(metav1.ListOptions{}):    true,
 }
 
 func ensureNoTags(t *testing.T, gvk schema.GroupVersionKind, tp reflect.Type, parents []reflect.Type) {
diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go
index 79fcd882f0e..742f8a0bcb1 100644
--- a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go
+++ b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go
@@ -28,7 +28,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
@@ -211,7 +210,7 @@ func TestCreater(t *testing.T) {
 		{
 			name:        "valid ListOptions creation",
 			kind:        schema.GroupVersionKind{Version: "v1", Kind: "ListOptions"},
-			expectedObj: &v1.ListOptions{},
+			expectedObj: &metav1.ListOptions{},
 			expectErr:   false,
 		},
 	}