diff --git a/tools/cli/internal/cli/merge/merge_test.go b/tools/cli/internal/cli/merge/merge_test.go
index d84569a062..159daa0396 100644
--- a/tools/cli/internal/cli/merge/merge_test.go
+++ b/tools/cli/internal/cli/merge/merge_test.go
@@ -90,7 +90,7 @@ func TestOpts_PreRunE(t *testing.T) {
 		},
 		{
 			wantErr:       require.NoError,
-			basePath:      "../../../test/data/valid_base_spec.json",
+			basePath:      "../../../test/data/base_spec.json",
 			name:          "Successful",
 			externalPaths: []string{"test"},
 		},
diff --git a/tools/cli/test/data/valid_apiregistry_spec.json b/tools/cli/test/data/apiregistry_spec.json
similarity index 96%
rename from tools/cli/test/data/valid_apiregistry_spec.json
rename to tools/cli/test/data/apiregistry_spec.json
index ff5f23ff46..19465f3321 100644
--- a/tools/cli/test/data/valid_apiregistry_spec.json
+++ b/tools/cli/test/data/apiregistry_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/valid_authn_spec.json b/tools/cli/test/data/authn_spec.json
similarity index 96%
rename from tools/cli/test/data/valid_authn_spec.json
rename to tools/cli/test/data/authn_spec.json
index 06eb1a8cbc..86e5db8b24 100644
--- a/tools/cli/test/data/valid_authn_spec.json
+++ b/tools/cli/test/data/authn_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/valid_base_spec.json b/tools/cli/test/data/base_spec.json
similarity index 100%
rename from tools/cli/test/data/valid_base_spec.json
rename to tools/cli/test/data/base_spec.json
diff --git a/tools/cli/test/data/duplicated_path_apiregistry_spec.json b/tools/cli/test/data/duplicated_path_apiregistry_spec.json
index fc68de2148..5522ca5439 100644
--- a/tools/cli/test/data/duplicated_path_apiregistry_spec.json
+++ b/tools/cli/test/data/duplicated_path_apiregistry_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
@@ -66,7 +66,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -91,7 +91,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/duplicated_tag_authn_spec.json b/tools/cli/test/data/duplicated_tag_authn_spec.json
index e6e90ddc1b..427c01fce8 100644
--- a/tools/cli/test/data/duplicated_tag_authn_spec.json
+++ b/tools/cli/test/data/duplicated_tag_authn_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/data/not_identical_component_apiregistry_spec.json b/tools/cli/test/data/not_identical_component_apiregistry_spec.json
index be43330df4..9e47a93f9a 100644
--- a/tools/cli/test/data/not_identical_component_apiregistry_spec.json
+++ b/tools/cli/test/data/not_identical_component_apiregistry_spec.json
@@ -28,7 +28,7 @@
         "operationId": "getOpenApiInfo",
         "parameters": [
           {
-            "$ref": "valid_base_spec.json#/components/parameters/pretty"
+            "$ref": "base_spec.json#/components/parameters/pretty"
           }
         ],
         "responses": {
@@ -53,7 +53,7 @@
             }
           },
           "500": {
-            "$ref": "valid_base_spec.json#/components/responses/internalServerError"
+            "$ref": "base_spec.json#/components/responses/internalServerError"
           }
         }
       }
diff --git a/tools/cli/test/e2e/cli/cli.go b/tools/cli/test/e2e/cli/cli.go
index 2c6964a683..4339531bb7 100644
--- a/tools/cli/test/e2e/cli/cli.go
+++ b/tools/cli/test/e2e/cli/cli.go
@@ -20,23 +20,23 @@ func NewBin() (string, error) {
 }
 
 func NewBaseSpec() (string, error) {
-	cliPath, err := filepath.Abs("../../data/valid_base_spec.json")
+	cliPath, err := filepath.Abs("../../data/base_spec.json")
 	if err != nil {
 		return "", err
 	}
 	return cliPath, nil
 }
 
-func NewValidAPIRegistrySpec() (string, error) {
-	cliPath, err := filepath.Abs("../../data/valid_apiregistry_spec.json")
+func NewAPIRegistrySpec() (string, error) {
+	cliPath, err := filepath.Abs("../../data/apiregistry_spec.json")
 	if err != nil {
 		return "", err
 	}
 	return cliPath, nil
 }
 
-func NewValidAuthNSpec() (string, error) {
-	cliPath, err := filepath.Abs("../../data/valid_authn_spec.json")
+func NewAuthNSpec() (string, error) {
+	cliPath, err := filepath.Abs("../../data/authn_spec.json")
 	if err != nil {
 		return "", err
 	}
diff --git a/tools/cli/test/e2e/cli/merge_test.go b/tools/cli/test/e2e/cli/merge_test.go
index 3f1b5df1fa..edfba62647 100644
--- a/tools/cli/test/e2e/cli/merge_test.go
+++ b/tools/cli/test/e2e/cli/merge_test.go
@@ -17,7 +17,7 @@ func TestMerge(t *testing.T) {
 	t.Run("Merge valid specs", func(t *testing.T) {
 		base, err := NewBaseSpec()
 		require.NoError(t, err)
-		external, err := NewValidAPIRegistrySpec()
+		external, err := NewAPIRegistrySpec()
 		require.NoError(t, err)
 
 		cmd := exec.Command(cliPath,
@@ -43,7 +43,7 @@ func TestMerge(t *testing.T) {
 		require.NoError(t, err)
 		apiRegistrySpec, err := NewDuplicatedPathAPIRegistrySpec()
 		require.NoError(t, err)
-		authnSpec, err := NewValidAuthNSpec()
+		authnSpec, err := NewAuthNSpec()
 		require.NoError(t, err)
 
 		cmd := exec.Command(cliPath,
@@ -66,7 +66,7 @@ func TestMerge(t *testing.T) {
 	t.Run("Expecting Error: Merge duplicated tag", func(t *testing.T) {
 		base, err := NewBaseSpec()
 		require.NoError(t, err)
-		apiRegistrySpec, err := NewValidAPIRegistrySpec()
+		apiRegistrySpec, err := NewAPIRegistrySpec()
 		require.NoError(t, err)
 		authnSpec, err := NewDuplicatedTagAuthNSpec()
 		require.NoError(t, err)
@@ -93,7 +93,7 @@ func TestMerge(t *testing.T) {
 		require.NoError(t, err)
 		apiRegistrySpec, err := NewNotIdenticalComponentPIRegistrySpec()
 		require.NoError(t, err)
-		authnSpec, err := NewValidAuthNSpec()
+		authnSpec, err := NewAuthNSpec()
 		require.NoError(t, err)
 
 		cmd := exec.Command(cliPath,