diff --git a/esti/golden/lakectl_repo_create_with_storage_id.golden b/esti/golden/lakectl_repo_create_with_storage_id.golden
deleted file mode 100644
index 7b506ace4e4..00000000000
--- a/esti/golden/lakectl_repo_create_with_storage_id.golden
+++ /dev/null
@@ -1,3 +0,0 @@
-Repository: lakefs://${REPO}
-error creating repository: storage id: invalid value: validation error
-400 Bad Request
diff --git a/esti/lakectl_test.go b/esti/lakectl_test.go
index df31b2598f0..83045804ebd 100644
--- a/esti/lakectl_test.go
+++ b/esti/lakectl_test.go
@@ -44,17 +44,6 @@ func TestLakectlBasicRepoActions(t *testing.T) {
 	}
 	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" repo create lakefs://"+repoName+" "+storage, false, "lakectl_repo_create", vars)
 
-	// Validate the --storage-id flag (currently only allowed to be empty)
-	repoNameSID := generateUniqueRepositoryName()
-	storageSID := generateUniqueStorageNamespace(repoNameSID)
-	vars = map[string]string{
-		"REPO":    repoNameSID,
-		"STORAGE": storageSID,
-		"BRANCH":  mainBranch,
-	}
-	RunCmdAndVerifyFailureWithFile(t, Lakectl()+" repo create lakefs://"+repoNameSID+" "+storageSID+" --storage-id storage1", false, "lakectl_repo_create_with_storage_id", vars)
-	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" repo create lakefs://"+repoNameSID+" "+storageSID+" --storage-id \"\"", false, "lakectl_repo_create", vars)
-
 	// lakectl repo list is expected to show the created repo
 
 	// Fails due to the usage of repos for isolation - esti creates repos in parallel and
@@ -75,6 +64,16 @@ func TestLakectlBasicRepoActions(t *testing.T) {
 	newStorage := storage + "/new-storage/"
 	RunCmdAndVerifyFailureWithFile(t, Lakectl()+" repo create lakefs://"+repoName+" "+newStorage, false, "lakectl_repo_create_not_unique", vars)
 
+	// Validate the --storage-id flag (currently only allowed to be empty)
+	repoNameSID := generateUniqueRepositoryName()
+	storageSID := generateUniqueStorageNamespace(repoNameSID)
+	vars = map[string]string{
+		"REPO":    repoNameSID,
+		"STORAGE": storageSID,
+		"BRANCH":  mainBranch,
+	}
+	RunCmdAndVerifySuccessWithFile(t, Lakectl()+" repo create lakefs://"+repoNameSID+" "+storageSID+" --storage-id \"\"", false, "lakectl_repo_create", vars)
+
 	// Fails due to the usage of repos for isolation - esti creates repos in parallel and
 	// the output of 'repo list' command cannot be well-defined
 	// RunCmdAndVerifySuccessWithFile(t, Lakectl()+" repo list", false, "lakectl_repo_list_1", vars)