diff --git a/Makefile b/Makefile
index a75b0dab64..de3b3f8f83 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ endif
 # Instructions to run tests.
 .PHONY: test
 test: ## Run Go unit test.
-	go test ./pkg/apis/trainer/v1alpha1/... ./pkg/controller/... ./pkg/runtime/... ./pkg/webhooks/... ./pkg/util/... -coverprofile cover.out
+	go test $(shell go list ./... | grep -v '/test/') -coverprofile cover.out
 
 .PHONY: test-integration
 test-integration: envtest jobset-operator-crd scheduler-plugins-crd ## Run Go integration test.
diff --git a/cmd/trainer-controller-manager/main.go b/cmd/trainer-controller-manager/main.go
index 4139bd52d6..623cbe6258 100644
--- a/cmd/trainer-controller-manager/main.go
+++ b/cmd/trainer-controller-manager/main.go
@@ -39,7 +39,7 @@ import (
 
 	kubeflowv1 "github.com/kubeflow/trainer/pkg/apis/trainer/v1alpha1"
 	kubeflowcontroller "github.com/kubeflow/trainer/pkg/controller"
-	runtime "github.com/kubeflow/trainer/pkg/runtime"
+	"github.com/kubeflow/trainer/pkg/runtime"
 	runtimecore "github.com/kubeflow/trainer/pkg/runtime/core"
 	"github.com/kubeflow/trainer/pkg/util/cert"
 	webhooks "github.com/kubeflow/trainer/pkg/webhooks"
diff --git a/pkg/controller/setup.go b/pkg/controller/setup.go
index 366b13eb73..c294f82f1b 100644
--- a/pkg/controller/setup.go
+++ b/pkg/controller/setup.go
@@ -20,7 +20,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 
-	runtime "github.com/kubeflow/trainer/pkg/runtime"
+	"github.com/kubeflow/trainer/pkg/runtime"
 )
 
 func SetupControllers(mgr ctrl.Manager, runtimes map[string]runtime.Runtime, options controller.Options) (string, error) {
diff --git a/pkg/webhooks/trainingruntime_webhook.go b/pkg/webhooks/trainingruntime_webhook.go
index e0edf99f8a..9c47c1020c 100644
--- a/pkg/webhooks/trainingruntime_webhook.go
+++ b/pkg/webhooks/trainingruntime_webhook.go
@@ -28,7 +28,7 @@ import (
 	jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2"
 
 	kubeflowv1 "github.com/kubeflow/trainer/pkg/apis/trainer/v1alpha1"
-	runtime "github.com/kubeflow/trainer/pkg/runtime"
+	"github.com/kubeflow/trainer/pkg/runtime"
 )
 
 type TrainingRuntimeWebhook struct {