diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go
index d2ef43b7c9c..93b20c025d9 100644
--- a/test/integration/etcd/data.go
+++ b/test/integration/etcd/data.go
@@ -29,7 +29,7 @@ import (
 // It is exported so that it can be reused across multiple tests.
 // It returns a new map on every invocation to prevent different tests from mutating shared state.
 func GetEtcdStorageData() map[schema.GroupVersionResource]StorageData {
-	return GetEtcdStorageDataForNamespace("etcdstoragepathtestnamespace")
+	return GetEtcdStorageDataForNamespaceServedAt("etcdstoragepathtestnamespace", utilversion.DefaultKubeEffectiveVersion().BinaryVersion().String(), true)
 }
 
 // GetEtcdStorageDataForNamespace returns etcd data for all persisted objects.
@@ -37,6 +37,10 @@ func GetEtcdStorageData() map[schema.GroupVersionResource]StorageData {
 // It returns a new map on every invocation to prevent different tests from mutating shared state.
 // Namespaced objects keys are computed for the specified namespace.
 func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionResource]StorageData {
+	return GetEtcdStorageDataForNamespaceServedAt(namespace, utilversion.DefaultKubeEffectiveVersion().BinaryVersion().String(), true)
+}
+
+func GetEtcdStorageDataForNamespaceServedAt(namespace string, emulationVersion string, includeAlpha bool) map[schema.GroupVersionResource]StorageData {
 	image := image.GetE2EImage(image.BusyBox)
 	etcdStorageData := map[schema.GroupVersionResource]StorageData{
 		// k8s.io/kubernetes/pkg/api/v1
@@ -481,6 +485,23 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
 		ExpectedEtcdPath: "/registry/csidrivers/csid2",
 	}
 
+	// ... delete stuff no longer served or not yet added at at emulatedVersion
+	// TODO: derive this programtically from gvk --> instance --> APILifecycle info
+	switch emulatedVersion {
+	case "1.33":
+		// delete flowcontrol
+	case "1.32":
+		// delete flowcontrol
+		// delete mutatingadmission
+	case "1.31":
+		// delete mutatingadmission
+	default:
+		error
+	}
+	if !includeAlpha {
+		// drop all alphas from etcdStorageData
+	}
+
 	return etcdStorageData
 }
 
diff --git a/test/integration/etcd/etcd_storage_path_test.go b/test/integration/etcd/etcd_storage_path_test.go
index bedc000856b..e909e4ee61b 100644
--- a/test/integration/etcd/etcd_storage_path_test.go
+++ b/test/integration/etcd/etcd_storage_path_test.go
@@ -75,13 +75,19 @@ var allowMissingTestdataFixtures = map[schema.GroupVersionKind]bool{
 // It will also fail when a type gets moved to a different location. Be very careful in this situation because
 // it essentially means that you will be break old clusters unless you create some migration path for the old data.
 func TestEtcdStoragePath(t *testing.T) {
+	testEtcdStoragePathAtVersion(t, utilversion.DefaultKubeEffectiveVersion().BinaryVersion().String(), true)
+	testEtcdStoragePathAtVersion(t, utilversion.DefaultKubeEffectiveVersion().BinaryVersion().SubtractMinor(1).String(), false)
+	testEtcdStoragePathAtVersion(t, utilversion.DefaultKubeEffectiveVersion().BinaryVersion().SubtractMinor(2).String(), false)
+}
+
+func testEtcdStoragePathAtVersion(t *testing.T, emulateVersion string, includeAlpha bool) {
 	// KUBE_APISERVER_SERVE_REMOVED_APIS_FOR_ONE_RELEASE allows for APIs pending removal to not block tests
 	t.Setenv("KUBE_APISERVER_SERVE_REMOVED_APIS_FOR_ONE_RELEASE", "true")
 
 	featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, "AllAlpha", true)
 	featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, "AllBeta", true)
 
-	apiServer := StartRealAPIServerOrDie(t)
+	apiServer := StartRealAPIServerOrDie(t, withEmulationVersion(emulateVersion))
 	defer apiServer.Cleanup()
 	defer dumpEtcdKVOnFailure(t, apiServer.KV)
 
@@ -91,7 +97,7 @@ func TestEtcdStoragePath(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	etcdStorageData := GetEtcdStorageData()
+	etcdStorageData := GetEtcdStorageDataForNamespaceServedAt("etcdstoragepathtestnamespace", emulateVersion, includeAlpha)
 
 	kindSeen := sets.NewString()
 	pathSeen := map[string][]schema.GroupVersionResource{}
diff --git a/test/integration/etcd/server.go b/test/integration/etcd/server.go
index 03911859aaf..08df976cbe8 100644
--- a/test/integration/etcd/server.go
+++ b/test/integration/etcd/server.go
@@ -62,6 +62,19 @@ AwEHoUQDQgAEH6cuzP8XuD5wal6wf9M6xDljTOPLX2i8uIp/C/ASqiIGUeeKQtX0
 /IR3qCXyThP/dbCiHrF3v1cuhBOHY8CLVg==
 -----END EC PRIVATE KEY-----`
 
+func withEmulationVersion(emulationVersion string) func(*options.ServerRunOptions) {
+	return func(*options.ServerRunOptions) {
+		featureGate := feature.DefaultMutableFeatureGate
+		featureGate.AddMetrics()
+
+		effectiveVersion := utilversion.DefaultKubeEffectiveVersion()
+		effectiveVersion.SetEmulationVersion(featureGate.EmulationVersion())
+		featuregatetesting.SetFeatureGateEmulationVersionDuringTest(t, featureGate, effectiveVersion.EmulationVersion())
+		featuregate.DefaultComponentGlobalsRegistry.Reset()
+		utilruntime.Must(featuregate.DefaultComponentGlobalsRegistry.Register(featuregate.DefaultKubeComponent, effectiveVersion, featureGate))
+	}
+}
+
 // StartRealAPIServerOrDie starts an API server that is appropriate for use in tests that require one of every resource
 func StartRealAPIServerOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOptions)) *APIServer {
 	tCtx := ktesting.Init(t)