diff --git a/test/integration/master/apiserver_identity_test.go b/test/integration/controlplane/apiserver_identity_test.go
similarity index 99%
rename from test/integration/master/apiserver_identity_test.go
rename to test/integration/controlplane/apiserver_identity_test.go
index d02d4a379ff..afe93b1bb29 100644
--- a/test/integration/master/apiserver_identity_test.go
+++ b/test/integration/controlplane/apiserver_identity_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"context"
diff --git a/test/integration/master/audit_test.go b/test/integration/controlplane/audit_test.go
similarity index 99%
rename from test/integration/master/audit_test.go
rename to test/integration/controlplane/audit_test.go
index 79ad221a4d6..d62f833aac2 100644
--- a/test/integration/master/audit_test.go
+++ b/test/integration/controlplane/audit_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"context"
diff --git a/test/integration/master/crd_test.go b/test/integration/controlplane/crd_test.go
similarity index 99%
rename from test/integration/master/crd_test.go
rename to test/integration/controlplane/crd_test.go
index a2076a20f41..c58df96ba48 100644
--- a/test/integration/master/crd_test.go
+++ b/test/integration/controlplane/crd_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"context"
diff --git a/test/integration/master/graceful_shutdown_test.go b/test/integration/controlplane/graceful_shutdown_test.go
similarity index 99%
rename from test/integration/master/graceful_shutdown_test.go
rename to test/integration/controlplane/graceful_shutdown_test.go
index bfc9ace43ed..33fefbc997f 100644
--- a/test/integration/master/graceful_shutdown_test.go
+++ b/test/integration/controlplane/graceful_shutdown_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"io"
diff --git a/test/integration/master/kms_transformation_test.go b/test/integration/controlplane/kms_transformation_test.go
similarity index 99%
rename from test/integration/master/kms_transformation_test.go
rename to test/integration/controlplane/kms_transformation_test.go
index c62981b4636..a4d8e8b8e67 100644
--- a/test/integration/master/kms_transformation_test.go
+++ b/test/integration/controlplane/kms_transformation_test.go
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"bytes"
diff --git a/test/integration/master/kube_apiserver_test.go b/test/integration/controlplane/kube_apiserver_test.go
similarity index 99%
rename from test/integration/master/kube_apiserver_test.go
rename to test/integration/controlplane/kube_apiserver_test.go
index fb4e553637f..3c6d07e081b 100644
--- a/test/integration/master/kube_apiserver_test.go
+++ b/test/integration/controlplane/kube_apiserver_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"bytes"
diff --git a/test/integration/master/main_test.go b/test/integration/controlplane/main_test.go
similarity index 97%
rename from test/integration/master/main_test.go
rename to test/integration/controlplane/main_test.go
index 10ce6851b8a..030d136955d 100644
--- a/test/integration/master/main_test.go
+++ b/test/integration/controlplane/main_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"testing"
diff --git a/test/integration/master/secrets_transformation_test.go b/test/integration/controlplane/secrets_transformation_test.go
similarity index 99%
rename from test/integration/master/secrets_transformation_test.go
rename to test/integration/controlplane/secrets_transformation_test.go
index f74950e6a06..2f405bb6a8c 100644
--- a/test/integration/master/secrets_transformation_test.go
+++ b/test/integration/controlplane/secrets_transformation_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"crypto/aes"
diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/controlplane/synthetic_controlplane_test.go
similarity index 99%
rename from test/integration/master/synthetic_master_test.go
rename to test/integration/controlplane/synthetic_controlplane_test.go
index c342e7e5141..45b1aaf8037 100644
--- a/test/integration/master/synthetic_master_test.go
+++ b/test/integration/controlplane/synthetic_controlplane_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"bytes"
diff --git a/test/integration/master/transformation_testcase.go b/test/integration/controlplane/transformation_testcase.go
similarity index 99%
rename from test/integration/master/transformation_testcase.go
rename to test/integration/controlplane/transformation_testcase.go
index 5ee45409566..352edd8b0a5 100644
--- a/test/integration/master/transformation_testcase.go
+++ b/test/integration/controlplane/transformation_testcase.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package master
+package controlplane
 
 import (
 	"bytes"
diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/controlplane_utils.go
similarity index 100%
rename from test/integration/framework/master_utils.go
rename to test/integration/framework/controlplane_utils.go