diff --git a/tests/metrics-collector-base_test.go b/tests/katib-v1alpha1-metrics-collector-base_test.go
similarity index 95%
rename from tests/metrics-collector-base_test.go
rename to tests/katib-v1alpha1-metrics-collector-base_test.go
index 179016b2835..81d61247a1c 100644
--- a/tests/metrics-collector-base_test.go
+++ b/tests/katib-v1alpha1-metrics-collector-base_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 )
 
-func writeMetricsCollectorBase(th *KustTestHarness) {
+func writeKatibV1Alpha1MetricsCollectorBase(th *KustTestHarness) {
 	th.writeF("/manifests/katib-v1alpha1/metrics-collector/base/metrics-collector-rbac.yaml", `
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -104,9 +104,9 @@ images:
 `)
 }
 
-func TestMetricsCollectorBase(t *testing.T) {
+func TestKatibV1Alpha1MetricsCollectorBase(t *testing.T) {
 	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/metrics-collector/base")
-	writeMetricsCollectorBase(th)
+	writeKatibV1Alpha1MetricsCollectorBase(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
diff --git a/tests/studyjob-base_test.go b/tests/katib-v1alpha1-studyjob-base_test.go
similarity index 97%
rename from tests/studyjob-base_test.go
rename to tests/katib-v1alpha1-studyjob-base_test.go
index 4b0bffb18a2..536a82cfe08 100644
--- a/tests/studyjob-base_test.go
+++ b/tests/katib-v1alpha1-studyjob-base_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 )
 
-func writeStudyjobBase(th *KustTestHarness) {
+func writeKatibV1Alpha1StudyJobBase(th *KustTestHarness) {
 	th.writeF("/manifests/katib-v1alpha1/studyjob/base/studyjob-controller-deployment.yaml", `
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -187,9 +187,9 @@ images:
 `)
 }
 
-func TestStudyjobBase(t *testing.T) {
+func TestKatibV1Alpha1StudyJobBase(t *testing.T) {
 	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/studyjob/base")
-	writeStudyjobBase(th)
+	writeKatibV1Alpha1StudyJobBase(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
diff --git a/tests/suggestion-base_test.go b/tests/katib-v1alpha1-suggestion-base_test.go
similarity index 98%
rename from tests/suggestion-base_test.go
rename to tests/katib-v1alpha1-suggestion-base_test.go
index 8861d6fedde..a4224c8713b 100644
--- a/tests/suggestion-base_test.go
+++ b/tests/katib-v1alpha1-suggestion-base_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 )
 
-func writeSuggestionBase(th *KustTestHarness) {
+func writeKatibV1Alpha1Suggestion(th *KustTestHarness) {
 	th.writeF("/manifests/katib-v1alpha1/suggestion/base/suggestion-bayesianoptimization-deployment.yaml", `
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -231,9 +231,9 @@ images:
 `)
 }
 
-func TestSuggestionBase(t *testing.T) {
+func TestKatibV1Alpha1Suggestion(t *testing.T) {
 	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/suggestion/base")
-	writeSuggestionBase(th)
+	writeKatibV1Alpha1Suggestion(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
diff --git a/tests/katib-ui-base_test.go b/tests/katib-v1alpha1-ui-base_test.go
similarity index 96%
rename from tests/katib-ui-base_test.go
rename to tests/katib-v1alpha1-ui-base_test.go
index 436b3f671dd..e9715b0ed2c 100644
--- a/tests/katib-ui-base_test.go
+++ b/tests/katib-v1alpha1-ui-base_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 )
 
-func writeKatibUiBase(th *KustTestHarness) {
+func writeKatibV1Alpha1UIBase(th *KustTestHarness) {
 	th.writeF("/manifests/katib-v1alpha1/katib-ui/base/katib-ui-deployment.yaml", `
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -124,9 +124,9 @@ vars:
 `)
 }
 
-func TestKatibUiBase(t *testing.T) {
+func TestKatibV1Alpha1UIBase(t *testing.T) {
 	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/katib-ui/base")
-	writeKatibUiBase(th)
+	writeKatibV1Alpha1UIBase(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
diff --git a/tests/katib-ui-overlays-istio_test.go b/tests/katib-v1alpha1-ui-overlays-istio_test.go
similarity index 95%
rename from tests/katib-ui-overlays-istio_test.go
rename to tests/katib-v1alpha1-ui-overlays-istio_test.go
index 056a90f04aa..e8736bbba08 100644
--- a/tests/katib-ui-overlays-istio_test.go
+++ b/tests/katib-v1alpha1-ui-overlays-istio_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 )
 
-func writeKatibUiOverlaysIstio(th *KustTestHarness) {
+func writeKatibV1Alpha1UIOverlaysIstio(th *KustTestHarness) {
 	th.writeF("/manifests/katib-v1alpha1/katib-ui/overlays/istio/katib-ui-virtual-service.yaml", `
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
@@ -161,14 +161,14 @@ vars:
 `)
 }
 
-func TestKatibUiOverlaysIstio(t *testing.T) {
-	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/katib-ui/overlays/istio")
-	writeKatibUiOverlaysIstio(th)
+func TestKatibV1Alpha1UIOverlaysIstio(t *testing.T) {
+	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/katib-ui/base")
+	writeKatibV1Alpha1UIOverlaysIstio(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
-	targetPath := "../katib-v1alpha1/katib-ui/overlays/istio"
+	targetPath := "../katib-v1alpha1/katib-ui/base"
 	fsys := fs.MakeRealFS()
 	_loader, loaderErr := loader.NewLoader(targetPath, fsys)
 	if loaderErr != nil {
diff --git a/tests/vizier-core-base_test.go b/tests/katib-v1alpha1-vizier-core-base_test.go
similarity index 97%
rename from tests/vizier-core-base_test.go
rename to tests/katib-v1alpha1-vizier-core-base_test.go
index 092eb6c9c77..fb11e1497a2 100644
--- a/tests/vizier-core-base_test.go
+++ b/tests/katib-v1alpha1-vizier-core-base_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 )
 
-func writeVizierCoreBase(th *KustTestHarness) {
+func writeKatibV1Alpha1VizierCore(th *KustTestHarness) {
 	th.writeF("/manifests/katib-v1alpha1/vizier-core/base/vizier-core-deployment.yaml", `
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -162,9 +162,9 @@ images:
 `)
 }
 
-func TestVizierCoreBase(t *testing.T) {
+func TestKatibV1Alpha1VizierCore(t *testing.T) {
 	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/vizier-core/base")
-	writeVizierCoreBase(th)
+	writeKatibV1Alpha1VizierCore(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
diff --git a/tests/vizier-db-base_test.go b/tests/katib-v1alpha1-vizier-db-base_test.go
similarity index 95%
rename from tests/vizier-db-base_test.go
rename to tests/katib-v1alpha1-vizier-db-base_test.go
index 17b31722df0..c83610374c7 100644
--- a/tests/vizier-db-base_test.go
+++ b/tests/katib-v1alpha1-vizier-db-base_test.go
@@ -11,7 +11,19 @@ import (
 	"testing"
 )
 
-func writeVizierDbBase(th *KustTestHarness) {
+func writeKatibV1Alpha1VizierDbBase(th *KustTestHarness) {
+	th.writeF("/manifests/katib-v1alpha1/vizier-db/base/vizier-db-pvc.yaml", `
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: katib-mysql
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+`)
 	th.writeF("/manifests/katib-v1alpha1/vizier-db/base/vizier-db-deployment.yaml", `
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -62,18 +74,6 @@ spec:
       - name: katib-mysql
         persistentVolumeClaim:
           claimName: katib-mysql
-`)
-	th.writeF("/manifests/katib-v1alpha1/vizier-db/base/vizier-db-pvc.yaml", `
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: katib-mysql
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 10Gi
 `)
 	th.writeF("/manifests/katib-v1alpha1/vizier-db/base/vizier-db-secret.yaml", `
 apiVersion: v1
@@ -115,9 +115,9 @@ images:
 `)
 }
 
-func TestVizierDbBase(t *testing.T) {
+func TestKatibV1Alpha1VizierDbBase(t *testing.T) {
 	th := NewKustTestHarness(t, "/manifests/katib-v1alpha1/vizier-db/base")
-	writeVizierDbBase(th)
+	writeKatibV1Alpha1VizierDbBase(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)