diff --git a/test/cmd/cmd.go b/test/cmd/cmd.go
index ea3f9e9..f316283 100644
--- a/test/cmd/cmd.go
+++ b/test/cmd/cmd.go
@@ -12,13 +12,13 @@ import (
 func Run(name string, args ...string) (string, error) {
 	cmd := exec.Command(name, args...)
 
-	wd, err := os.Getwd()
+	rootDir, err := GetProjectRoot()
 	if err != nil {
-		return wd, err
+		return "", err
 	}
-	wd = strings.Replace(wd, "/test/e2e", "", -1)
+
 	// Command will run from project root
-	cmd.Dir = wd
+	cmd.Dir = rootDir
 
 	command := strings.Join(cmd.Args, " ")
 	output, err := cmd.CombinedOutput()
diff --git a/test/testhelper/kube/kube.go b/test/testhelper/kube/kube.go
index bba018c..6db4524 100644
--- a/test/testhelper/kube/kube.go
+++ b/test/testhelper/kube/kube.go
@@ -15,6 +15,7 @@ import (
 func CreateSecretFromEnvVar(envVar, secretName string) {
 	value, _ := os.LookupEnv(envVar)
 	Expect(value).NotTo(BeEmpty())
+
 	_, err := cmd.Run("kubectl", "create", "secret", "generic", secretName, "--from-literal=token="+value)
 	Expect(err).NotTo(HaveOccurred())
 }
@@ -26,6 +27,8 @@ func CreateSecretFromFile(fileName, secretName string) {
 
 func CreateOpCredentialsSecret() {
 	rootDir, err := cmd.GetProjectRoot()
+	Expect(err).NotTo(HaveOccurred())
+
 	credentialsFilePath := filepath.Join(rootDir, "1password-credentials.json")
 	data, err := os.ReadFile(credentialsFilePath)
 	Expect(err).NotTo(HaveOccurred())