diff --git a/test/e2e/instascale_app_wrapper.go b/test/e2e/instascale_app_wrapper.go
index f9ec3bd0c..5307378b2 100644
--- a/test/e2e/instascale_app_wrapper.go
+++ b/test/e2e/instascale_app_wrapper.go
@@ -17,14 +17,13 @@ limitations under the License.
 package e2e
 
 import (
+	. "github.com/project-codeflare/codeflare-common/support"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
 func createInstaScaleJobAppWrapper(test Test, namespace *corev1.Namespace, config *corev1.ConfigMap) (*batchv1.Job, *mcadv1beta1.AppWrapper, error) {
diff --git a/test/e2e/instascale_machinepool_test.go b/test/e2e/instascale_machinepool_test.go
index b6ad0782c..38c50cf8f 100644
--- a/test/e2e/instascale_machinepool_test.go
+++ b/test/e2e/instascale_machinepool_test.go
@@ -20,9 +20,8 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
+	. "github.com/project-codeflare/codeflare-common/support"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
-
-	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
 func TestInstascaleMachinePool(t *testing.T) {
diff --git a/test/e2e/mnist_pytorch_mcad_job_test.go b/test/e2e/mnist_pytorch_mcad_job_test.go
index 84722152a..7a157c040 100644
--- a/test/e2e/mnist_pytorch_mcad_job_test.go
+++ b/test/e2e/mnist_pytorch_mcad_job_test.go
@@ -20,14 +20,13 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
+	. "github.com/project-codeflare/codeflare-common/support"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
 // Trains the MNIST dataset as a batch Job managed by MCAD, and asserts successful completion of the training job.
diff --git a/test/e2e/mnist_raycluster_sdk_test.go b/test/e2e/mnist_raycluster_sdk_test.go
index e96110651..d39e5c3d4 100644
--- a/test/e2e/mnist_raycluster_sdk_test.go
+++ b/test/e2e/mnist_raycluster_sdk_test.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
+	. "github.com/project-codeflare/codeflare-common/support"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 	rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 
@@ -27,8 +28,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
 // Creates a Ray cluster, and trains the MNIST dataset using the CodeFlare SDK.
diff --git a/test/e2e/mnist_rayjob_mcad_raycluster_test.go b/test/e2e/mnist_rayjob_mcad_raycluster_test.go
index 7752d2eab..dc35f4ee8 100644
--- a/test/e2e/mnist_rayjob_mcad_raycluster_test.go
+++ b/test/e2e/mnist_rayjob_mcad_raycluster_test.go
@@ -21,14 +21,13 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
+	. "github.com/project-codeflare/codeflare-common/support"
 	mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 	rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	. "github.com/project-codeflare/codeflare-operator/test/support"
 )
 
 // Trains the MNIST dataset as a RayJob, executed by a Ray cluster managed by MCAD,
diff --git a/test/e2e/support.go b/test/e2e/support.go
index 14bf19ce4..e91656880 100644
--- a/test/e2e/support.go
+++ b/test/e2e/support.go
@@ -20,8 +20,7 @@ import (
 	"embed"
 
 	"github.com/onsi/gomega"
-
-	"github.com/project-codeflare/codeflare-operator/test/support"
+	"github.com/project-codeflare/codeflare-common/support"
 )
 
 //go:embed *.py *.txt