diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go
index ce3ced35b27..cf073846fc7 100644
--- a/cmd/kube-apiserver/app/aggregator.go
+++ b/cmd/kube-apiserver/app/aggregator.go
@@ -251,43 +251,44 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
 	// can reasonably expect seems questionable.
 	{Group: "extensions", Version: "v1beta1"}: {group: 17900, version: 1},
 	// to my knowledge, nothing below here collides
-	{Group: "apps", Version: "v1"}:                              {group: 17800, version: 15},
-	{Group: "events.k8s.io", Version: "v1beta1"}:                {group: 17750, version: 5},
-	{Group: "authentication.k8s.io", Version: "v1"}:             {group: 17700, version: 15},
-	{Group: "authentication.k8s.io", Version: "v1beta1"}:        {group: 17700, version: 9},
-	{Group: "authorization.k8s.io", Version: "v1"}:              {group: 17600, version: 15},
-	{Group: "authorization.k8s.io", Version: "v1beta1"}:         {group: 17600, version: 9},
-	{Group: "autoscaling", Version: "v1"}:                       {group: 17500, version: 15},
-	{Group: "autoscaling", Version: "v2beta1"}:                  {group: 17500, version: 9},
-	{Group: "autoscaling", Version: "v2beta2"}:                  {group: 17500, version: 1},
-	{Group: "batch", Version: "v1"}:                             {group: 17400, version: 15},
-	{Group: "batch", Version: "v1beta1"}:                        {group: 17400, version: 9},
-	{Group: "batch", Version: "v2alpha1"}:                       {group: 17400, version: 9},
-	{Group: "certificates.k8s.io", Version: "v1beta1"}:          {group: 17300, version: 9},
-	{Group: "networking.k8s.io", Version: "v1"}:                 {group: 17200, version: 15},
-	{Group: "networking.k8s.io", Version: "v1beta1"}:            {group: 17200, version: 9},
-	{Group: "policy", Version: "v1beta1"}:                       {group: 17100, version: 9},
-	{Group: "rbac.authorization.k8s.io", Version: "v1"}:         {group: 17000, version: 15},
-	{Group: "rbac.authorization.k8s.io", Version: "v1beta1"}:    {group: 17000, version: 12},
-	{Group: "rbac.authorization.k8s.io", Version: "v1alpha1"}:   {group: 17000, version: 9},
-	{Group: "settings.k8s.io", Version: "v1alpha1"}:             {group: 16900, version: 9},
-	{Group: "storage.k8s.io", Version: "v1"}:                    {group: 16800, version: 15},
-	{Group: "storage.k8s.io", Version: "v1beta1"}:               {group: 16800, version: 9},
-	{Group: "storage.k8s.io", Version: "v1alpha1"}:              {group: 16800, version: 1},
-	{Group: "apiextensions.k8s.io", Version: "v1"}:              {group: 16700, version: 15},
-	{Group: "apiextensions.k8s.io", Version: "v1beta1"}:         {group: 16700, version: 9},
-	{Group: "admissionregistration.k8s.io", Version: "v1"}:      {group: 16700, version: 15},
-	{Group: "admissionregistration.k8s.io", Version: "v1beta1"}: {group: 16700, version: 12},
-	{Group: "scheduling.k8s.io", Version: "v1"}:                 {group: 16600, version: 15},
-	{Group: "scheduling.k8s.io", Version: "v1beta1"}:            {group: 16600, version: 12},
-	{Group: "scheduling.k8s.io", Version: "v1alpha1"}:           {group: 16600, version: 9},
-	{Group: "coordination.k8s.io", Version: "v1"}:               {group: 16500, version: 15},
-	{Group: "coordination.k8s.io", Version: "v1beta1"}:          {group: 16500, version: 9},
-	{Group: "auditregistration.k8s.io", Version: "v1alpha1"}:    {group: 16400, version: 1},
-	{Group: "node.k8s.io", Version: "v1alpha1"}:                 {group: 16300, version: 1},
-	{Group: "node.k8s.io", Version: "v1beta1"}:                  {group: 16300, version: 9},
-	{Group: "discovery.k8s.io", Version: "v1beta1"}:             {group: 16200, version: 12},
-	{Group: "discovery.k8s.io", Version: "v1alpha1"}:            {group: 16200, version: 9},
+	{Group: "apps", Version: "v1"}:                               {group: 17800, version: 15},
+	{Group: "events.k8s.io", Version: "v1beta1"}:                 {group: 17750, version: 5},
+	{Group: "authentication.k8s.io", Version: "v1"}:              {group: 17700, version: 15},
+	{Group: "authentication.k8s.io", Version: "v1beta1"}:         {group: 17700, version: 9},
+	{Group: "authorization.k8s.io", Version: "v1"}:               {group: 17600, version: 15},
+	{Group: "authorization.k8s.io", Version: "v1beta1"}:          {group: 17600, version: 9},
+	{Group: "autoscaling", Version: "v1"}:                        {group: 17500, version: 15},
+	{Group: "autoscaling", Version: "v2beta1"}:                   {group: 17500, version: 9},
+	{Group: "autoscaling", Version: "v2beta2"}:                   {group: 17500, version: 1},
+	{Group: "batch", Version: "v1"}:                              {group: 17400, version: 15},
+	{Group: "batch", Version: "v1beta1"}:                         {group: 17400, version: 9},
+	{Group: "batch", Version: "v2alpha1"}:                        {group: 17400, version: 9},
+	{Group: "certificates.k8s.io", Version: "v1beta1"}:           {group: 17300, version: 9},
+	{Group: "networking.k8s.io", Version: "v1"}:                  {group: 17200, version: 15},
+	{Group: "networking.k8s.io", Version: "v1beta1"}:             {group: 17200, version: 9},
+	{Group: "policy", Version: "v1beta1"}:                        {group: 17100, version: 9},
+	{Group: "rbac.authorization.k8s.io", Version: "v1"}:          {group: 17000, version: 15},
+	{Group: "rbac.authorization.k8s.io", Version: "v1beta1"}:     {group: 17000, version: 12},
+	{Group: "rbac.authorization.k8s.io", Version: "v1alpha1"}:    {group: 17000, version: 9},
+	{Group: "settings.k8s.io", Version: "v1alpha1"}:              {group: 16900, version: 9},
+	{Group: "storage.k8s.io", Version: "v1"}:                     {group: 16800, version: 15},
+	{Group: "storage.k8s.io", Version: "v1beta1"}:                {group: 16800, version: 9},
+	{Group: "storage.k8s.io", Version: "v1alpha1"}:               {group: 16800, version: 1},
+	{Group: "apiextensions.k8s.io", Version: "v1"}:               {group: 16700, version: 15},
+	{Group: "apiextensions.k8s.io", Version: "v1beta1"}:          {group: 16700, version: 9},
+	{Group: "admissionregistration.k8s.io", Version: "v1"}:       {group: 16700, version: 15},
+	{Group: "admissionregistration.k8s.io", Version: "v1beta1"}:  {group: 16700, version: 12},
+	{Group: "scheduling.k8s.io", Version: "v1"}:                  {group: 16600, version: 15},
+	{Group: "scheduling.k8s.io", Version: "v1beta1"}:             {group: 16600, version: 12},
+	{Group: "scheduling.k8s.io", Version: "v1alpha1"}:            {group: 16600, version: 9},
+	{Group: "coordination.k8s.io", Version: "v1"}:                {group: 16500, version: 15},
+	{Group: "coordination.k8s.io", Version: "v1beta1"}:           {group: 16500, version: 9},
+	{Group: "auditregistration.k8s.io", Version: "v1alpha1"}:     {group: 16400, version: 1},
+	{Group: "node.k8s.io", Version: "v1alpha1"}:                  {group: 16300, version: 1},
+	{Group: "node.k8s.io", Version: "v1beta1"}:                   {group: 16300, version: 9},
+	{Group: "discovery.k8s.io", Version: "v1beta1"}:              {group: 16200, version: 12},
+	{Group: "discovery.k8s.io", Version: "v1alpha1"}:             {group: 16200, version: 9},
+	{Group: "flowcontrol.apiserver.k8s.io", Version: "v1alpha1"}: {group: 16100, version: 9},
 	// Append a new group to the end of the list if unsure.
 	// You can use min(existing group)-100 as the initial value for a group.
 	// Version can be set to 9 (to have space around) for a new group.
diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go
index e4b10416d80..525a8da73fa 100644
--- a/test/integration/etcd/data.go
+++ b/test/integration/etcd/data.go
@@ -247,6 +247,20 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
 		},
 		// --
 
+		// k8s.io/kubernetes/pkg/apis/flowcontrol/v1alpha1
+		gvr("flowcontrol.apiserver.k8s.io", "v1alpha1", "flowschemas"): {
+			Stub:             `{"metadata": {"name": "va1"}, "spec": {"priorityLevelConfiguration": {"name": "name1"}}}`,
+			ExpectedEtcdPath: "/registry/flowschemas/va1",
+		},
+		// --
+
+		// k8s.io/kubernetes/pkg/apis/flowcontrol/v1alpha1
+		gvr("flowcontrol.apiserver.k8s.io", "v1alpha1", "prioritylevelconfigurations"): {
+			Stub:             `{"metadata": {"name": "conf1"}, "spec": {"type": "Limited", "limited": {"assuredConcurrencyShares":3, "limitResponse": {"type": "Reject"}}}}`,
+			ExpectedEtcdPath: "/registry/prioritylevelconfigurations/conf1",
+		},
+		// --
+
 		// k8s.io/kubernetes/pkg/apis/storage/v1beta1
 		gvr("storage.k8s.io", "v1beta1", "volumeattachments"): {
 			Stub:             `{"metadata": {"name": "va2"}, "spec": {"attacher": "gce", "nodeName": "localhost", "source": {"persistentVolumeName": "pv2"}}}`,