diff --git a/hack/import-restrictions.yaml b/hack/import-restrictions.yaml
index 692485df1cf..1b740a293cf 100644
--- a/hack/import-restrictions.yaml
+++ b/hack/import-restrictions.yaml
@@ -1,3 +1,19 @@
+- baseImportPath: "./pkg/apis/core/"
+  allowedImports:
+  - k8s.io/apimachinery
+  - k8s.io/kubernetes/pkg/apis/core
+  - k8s.io/kubernetes/pkg/util
+  - k8s.io/api/core/v1
+
+  # the following are temporary and should go away. Think twice (or more) before adding anything here.
+  # Main goal: pkg/apis should be as self-contained as possible.
+  - k8s.io/kubernetes/pkg/apis/extensions
+  - k8s.io/kubernetes/pkg/api/legacyscheme
+  - k8s.io/kubernetes/pkg/api/testapi
+  - k8s.io/api/extensions/v1beta1
+  ignoredSubTrees:
+  - "./pkg/apis/core/validation"
+
 - baseImportPath: "./vendor/k8s.io/apimachinery/"
   allowedImports:
   - k8s.io/apimachinery
diff --git a/pkg/apis/core/v1/conversion_test.go b/pkg/apis/core/v1/conversion_test.go
index d60791b5707..e6d2bbdc56e 100644
--- a/pkg/apis/core/v1/conversion_test.go
+++ b/pkg/apis/core/v1/conversion_test.go
@@ -29,12 +29,13 @@ import (
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/api/testing/fuzzer"
+	metafuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	kapitesting "k8s.io/kubernetes/pkg/api/testing"
 	"k8s.io/kubernetes/pkg/apis/core"
+	corefuzzer "k8s.io/kubernetes/pkg/apis/core/fuzzer"
 	corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	utilpointer "k8s.io/kubernetes/pkg/util/pointer"
@@ -280,7 +281,7 @@ func TestReplicationControllerConversion(t *testing.T) {
 	}
 
 	// Add some fuzzed RCs.
-	apiObjectFuzzer := fuzzer.FuzzerFor(kapitesting.FuzzerFuncs, rand.NewSource(152), legacyscheme.Codecs)
+	apiObjectFuzzer := fuzzer.FuzzerFor(fuzzer.MergeFuzzerFuncs(metafuzzer.Funcs, corefuzzer.Funcs), rand.NewSource(152), legacyscheme.Codecs)
 	for i := 0; i < 100; i++ {
 		rc := &v1.ReplicationController{}
 		apiObjectFuzzer.Fuzz(rc)