diff --git a/apiserver/apiserver.go b/apiserver/apiserver.go
index e6f12c87..3d851c1f 100644
--- a/apiserver/apiserver.go
+++ b/apiserver/apiserver.go
@@ -19,7 +19,7 @@ package apiserver
 import (
 	"fmt"
 
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1"
+	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1"
 	testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
@@ -29,7 +29,7 @@ import (
 	etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
 
 	// Install the testgroup API
-	_ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install"
+	_ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/install"
 )
 
 const (
diff --git a/apiserver/apiserver_test.go b/apiserver/apiserver_test.go
index e36b359c..5e5ab814 100644
--- a/apiserver/apiserver_test.go
+++ b/apiserver/apiserver_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1"
+	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io/v1"
 
 	"github.com/stretchr/testify/assert"
 	"k8s.io/kubernetes/pkg/api/unversioned"
@@ -107,7 +107,7 @@ func testAPIGroupList(t *testing.T) {
 }
 
 func testAPIGroup(t *testing.T) {
-	serverURL := serverIP + "/apis/testgroup"
+	serverURL := serverIP + "/apis/testgroup.k8s.io"
 	contents, err := readResponse(serverURL)
 	if err != nil {
 		t.Fatalf("%v", err)
@@ -126,7 +126,7 @@ func testAPIGroup(t *testing.T) {
 }
 
 func testAPIResourceList(t *testing.T) {
-	serverURL := serverIP + "/apis/testgroup/v1"
+	serverURL := serverIP + "/apis/testgroup.k8s.io/v1"
 	contents, err := readResponse(serverURL)
 	if err != nil {
 		t.Fatalf("%v", err)
diff --git a/apiserver/rest/reststorage.go b/apiserver/rest/reststorage.go
index 5f2c575a..695c9e44 100644
--- a/apiserver/rest/reststorage.go
+++ b/apiserver/rest/reststorage.go
@@ -17,7 +17,7 @@ limitations under the License.
 package rest
 
 import (
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup"
+	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testdata/apis/testgroup.k8s.io"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"