diff --git a/pkg/cmd/admin/policy/modify_roles_test.go b/pkg/oc/admin/policy/modify_roles_test.go
similarity index 92%
rename from pkg/cmd/admin/policy/modify_roles_test.go
rename to pkg/oc/admin/policy/modify_roles_test.go
index 0c53ea2be929..d0fd7817f136 100644
--- a/pkg/cmd/admin/policy/modify_roles_test.go
+++ b/pkg/oc/admin/policy/modify_roles_test.go
@@ -9,7 +9,6 @@ import (
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	fakeauthorizationclient "github.com/openshift/origin/pkg/authorization/generated/internalclientset/fake"
-	"github.com/openshift/origin/pkg/oc/admin/policy"
 )
 
 func TestModifyNamedClusterRoleBinding(t *testing.T) {
@@ -126,11 +125,11 @@ func TestModifyNamedClusterRoleBinding(t *testing.T) {
 	}
 	for tcName, tc := range tests {
 		// Set up modifier options and run AddRole()
-		o := &policy.RoleModificationOptions{
+		o := &RoleModificationOptions{
 			RoleName:            tc.inputRole,
 			RoleBindingName:     tc.inputRoleBindingName,
 			Users:               tc.inputSubjects,
-			RoleBindingAccessor: policy.NewClusterRoleBindingAccessor(fakeauthorizationclient.NewSimpleClientset(tc.existingClusterRoleBindings).Authorization()),
+			RoleBindingAccessor: NewClusterRoleBindingAccessor(fakeauthorizationclient.NewSimpleClientset(tc.existingClusterRoleBindings).Authorization()),
 		}
 
 		addRoleAndCheck(t, o, tcName, tc.expectedRoleBindingName, tc.expectedSubjects)
@@ -259,19 +258,19 @@ func TestModifyNamedLocalRoleBinding(t *testing.T) {
 	}
 	for tcName, tc := range tests {
 		// Set up modifier options and run AddRole()
-		o := &policy.RoleModificationOptions{
+		o := &RoleModificationOptions{
 			RoleName:            tc.inputRole,
 			RoleBindingName:     tc.inputRoleBindingName,
 			Users:               tc.inputSubjects,
 			RoleNamespace:       metav1.NamespaceDefault,
-			RoleBindingAccessor: policy.NewLocalRoleBindingAccessor(metav1.NamespaceDefault, fakeauthorizationclient.NewSimpleClientset(tc.existingRoleBindings).Authorization()),
+			RoleBindingAccessor: NewLocalRoleBindingAccessor(metav1.NamespaceDefault, fakeauthorizationclient.NewSimpleClientset(tc.existingRoleBindings).Authorization()),
 		}
 
 		addRoleAndCheck(t, o, tcName, tc.expectedRoleBindingName, tc.expectedSubjects)
 	}
 }
 
-func addRoleAndCheck(t *testing.T, o *policy.RoleModificationOptions, tcName, expectedName string, expectedSubjects []string) {
+func addRoleAndCheck(t *testing.T, o *RoleModificationOptions, tcName, expectedName string, expectedSubjects []string) {
 	err := o.AddRole()
 	if err != nil {
 		t.Errorf("%s: unexpected err %v", tcName, err)
diff --git a/test/integration/newapp_test.go b/test/integration/newapp_test.go
index 4e4a0aa83154..82465f43b688 100644
--- a/test/integration/newapp_test.go
+++ b/test/integration/newapp_test.go
@@ -37,7 +37,6 @@ import (
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	"github.com/openshift/origin/pkg/generate"
 	"github.com/openshift/origin/pkg/generate/app"
-	"github.com/openshift/origin/pkg/generate/app/cmd"
 	apptest "github.com/openshift/origin/pkg/generate/app/test"
 	"github.com/openshift/origin/pkg/generate/dockerfile"
 	"github.com/openshift/origin/pkg/generate/git"
@@ -48,6 +47,7 @@ import (
 	imageinternalversion "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
 	dockerregistry "github.com/openshift/origin/pkg/image/importer/dockerv1client"
 	clicmd "github.com/openshift/origin/pkg/oc/cli/cmd"
+	"github.com/openshift/origin/pkg/oc/generate/app/cmd"
 	routefake "github.com/openshift/origin/pkg/route/generated/internalclientset/fake"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	templatefake "github.com/openshift/origin/pkg/template/generated/internalclientset/fake"