diff --git a/test/integration/aws.go b/test/integration/aws.go
index 5270ba517e..ddbda1e02d 100644
--- a/test/integration/aws.go
+++ b/test/integration/aws.go
@@ -66,7 +66,7 @@ type AWSClient struct {
 func (client *AWSClient) getInstances(instanceStateFilter []*string, clusterID string) ([]*ec2.Instance, error) {
 	requestFilters := []*ec2.Filter{
 		{
-			Name:   aws.String("tag:tectonicClusterID"),
+			Name:   aws.String("tag:openshiftClusterID"),
 			Values: []*string{aws.String(clusterID)},
 		},
 	}
diff --git a/test/integration/manifests/machineset.yaml b/test/integration/manifests/machineset.yaml
index 5e4301ecb6..172428d6aa 100644
--- a/test/integration/manifests/machineset.yaml
+++ b/test/integration/manifests/machineset.yaml
@@ -45,7 +45,7 @@ spec:
               values:
               - {{ .ClusterID }}-worker-*
           tags:
-          - name: tectonicClusterID
+          - name: openshiftClusterID
             value: {{ .ClusterID }}
           userDataSecret:
             name: ignition-worker