diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index ea81fd4e7c..88c20428d5 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Test
       run: |
         cd yb-voyager
-        go test -v  -skip '^(TestDDLIssuesInYBVersion|TestDMLIssuesInYBVersion)$' ./... -tags '!integration'
+        go test -v ./... -tags 'unit'
         
     - name: Vet
       run: |
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index b6b018be21..d94a594cb1 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -50,4 +50,4 @@ jobs:
     - name: Run Integration Tests
       run: |
         cd yb-voyager
-        go test -v -skip '^(TestDDLIssuesInYBVersion|TestDMLIssuesInYBVersion)$' ./... -tags 'integration'
+        go test -v ./... -tags 'integration'
diff --git a/.github/workflows/issue-tests.yml b/.github/workflows/issue-tests.yml
index 7db2e6260c..550eef3c8a 100644
--- a/.github/workflows/issue-tests.yml
+++ b/.github/workflows/issue-tests.yml
@@ -47,4 +47,4 @@ jobs:
     - name: Test Issues Against YB Version
       run: |
         cd yb-voyager
-        go test -v -run '^(TestDDLIssuesInYBVersion|TestDMLIssuesInYBVersion)$' ./... -tags '!integration'
+        go test -v ./... -tags 'issues_integration'
diff --git a/yb-voyager/cmd/analyzeSchema_test.go b/yb-voyager/cmd/analyzeSchema_test.go
index 1b97697d31..d768b94b06 100644
--- a/yb-voyager/cmd/analyzeSchema_test.go
+++ b/yb-voyager/cmd/analyzeSchema_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/cmd/assessMigrationBulkCommand_test.go b/yb-voyager/cmd/assessMigrationBulkCommand_test.go
index cfb8b3436f..5b887c901a 100644
--- a/yb-voyager/cmd/assessMigrationBulkCommand_test.go
+++ b/yb-voyager/cmd/assessMigrationBulkCommand_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/cmd/common_test.go b/yb-voyager/cmd/common_test.go
index 6a5c462365..49eee13b08 100644
--- a/yb-voyager/cmd/common_test.go
+++ b/yb-voyager/cmd/common_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package cmd
 
 import (
diff --git a/yb-voyager/cmd/exportDataStatus_test.go b/yb-voyager/cmd/exportDataStatus_test.go
index 692710aace..20142dba4a 100644
--- a/yb-voyager/cmd/exportDataStatus_test.go
+++ b/yb-voyager/cmd/exportDataStatus_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package cmd
 
 import (
diff --git a/yb-voyager/cmd/exportSchema_test.go b/yb-voyager/cmd/exportSchema_test.go
index 432f763330..a399b0e70a 100644
--- a/yb-voyager/cmd/exportSchema_test.go
+++ b/yb-voyager/cmd/exportSchema_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
@@ -17,9 +19,10 @@ limitations under the License.
 package cmd
 
 import (
-	"github.com/stretchr/testify/assert"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestShardingRecommendations(t *testing.T) {
diff --git a/yb-voyager/cmd/import_data_test.go b/yb-voyager/cmd/import_data_test.go
index e8c3a2300f..59fccddf30 100644
--- a/yb-voyager/cmd/import_data_test.go
+++ b/yb-voyager/cmd/import_data_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package cmd
 
 import (
diff --git a/yb-voyager/cmd/live_migration_test.go b/yb-voyager/cmd/live_migration_test.go
index 3ace7907a3..81f9da5466 100644
--- a/yb-voyager/cmd/live_migration_test.go
+++ b/yb-voyager/cmd/live_migration_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/adaptiveparallelism/adaptive_parallelism_test.go b/yb-voyager/src/adaptiveparallelism/adaptive_parallelism_test.go
index 7b4438d9e9..139b443f4d 100644
--- a/yb-voyager/src/adaptiveparallelism/adaptive_parallelism_test.go
+++ b/yb-voyager/src/adaptiveparallelism/adaptive_parallelism_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/callhome/diagnostics_test.go b/yb-voyager/src/callhome/diagnostics_test.go
index 9d63b562b5..84781c01fa 100644
--- a/yb-voyager/src/callhome/diagnostics_test.go
+++ b/yb-voyager/src/callhome/diagnostics_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package callhome
 
 import (
diff --git a/yb-voyager/src/cp/yugabyted/yugabyted_test.go b/yb-voyager/src/cp/yugabyted/yugabyted_test.go
index 90bf0c5e25..8e94839d06 100644
--- a/yb-voyager/src/cp/yugabyted/yugabyted_test.go
+++ b/yb-voyager/src/cp/yugabyted/yugabyted_test.go
@@ -1,3 +1,20 @@
+//go:build integration
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package yugabyted
 
 import (
diff --git a/yb-voyager/src/datafile/descriptor_test.go b/yb-voyager/src/datafile/descriptor_test.go
index 6092aba4c3..7c8b5eace3 100644
--- a/yb-voyager/src/datafile/descriptor_test.go
+++ b/yb-voyager/src/datafile/descriptor_test.go
@@ -1,3 +1,21 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package datafile
 
 import (
diff --git a/yb-voyager/src/dbzm/status_test.go b/yb-voyager/src/dbzm/status_test.go
index 753188dfd8..cfd1f4deaf 100644
--- a/yb-voyager/src/dbzm/status_test.go
+++ b/yb-voyager/src/dbzm/status_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package dbzm
 
 import (
diff --git a/yb-voyager/src/issue/issue_test.go b/yb-voyager/src/issue/issue_test.go
index 19ae50de6d..4dd58a5649 100644
--- a/yb-voyager/src/issue/issue_test.go
+++ b/yb-voyager/src/issue/issue_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
@@ -13,7 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-
 package issue
 
 import (
diff --git a/yb-voyager/src/metadb/metadataDB_test.go b/yb-voyager/src/metadb/metadataDB_test.go
index b6c0126927..bee70480ea 100644
--- a/yb-voyager/src/metadb/metadataDB_test.go
+++ b/yb-voyager/src/metadb/metadataDB_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package metadb
 
 import (
diff --git a/yb-voyager/src/migassessment/assessmentDB_test.go b/yb-voyager/src/migassessment/assessmentDB_test.go
index 854b52c8fd..204acbb128 100644
--- a/yb-voyager/src/migassessment/assessmentDB_test.go
+++ b/yb-voyager/src/migassessment/assessmentDB_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package migassessment
 
 import (
diff --git a/yb-voyager/src/migassessment/sizing_test.go b/yb-voyager/src/migassessment/sizing_test.go
index dff6c52522..f65bfeb5fb 100644
--- a/yb-voyager/src/migassessment/sizing_test.go
+++ b/yb-voyager/src/migassessment/sizing_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/namereg/namereg_test.go b/yb-voyager/src/namereg/namereg_test.go
index c785dbff02..f4c1430daf 100644
--- a/yb-voyager/src/namereg/namereg_test.go
+++ b/yb-voyager/src/namereg/namereg_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package namereg
 
 import (
diff --git a/yb-voyager/src/query/queryissue/detectors_test.go b/yb-voyager/src/query/queryissue/detectors_test.go
index 266f053ba0..16c136d3bc 100644
--- a/yb-voyager/src/query/queryissue/detectors_test.go
+++ b/yb-voyager/src/query/queryissue/detectors_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/query/queryissue/issues_ddl_test.go b/yb-voyager/src/query/queryissue/issues_ddl_test.go
index 68993779aa..d5f054db3a 100644
--- a/yb-voyager/src/query/queryissue/issues_ddl_test.go
+++ b/yb-voyager/src/query/queryissue/issues_ddl_test.go
@@ -1,5 +1,8 @@
+//go:build issues_integration
+
 /*
 Copyright (c) YugabyteDB, Inc.
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -24,9 +27,9 @@ import (
 	"github.com/jackc/pgx/v5"
 	"github.com/stretchr/testify/assert"
 	"github.com/testcontainers/testcontainers-go/modules/yugabytedb"
-
 	"github.com/yugabyte/yb-voyager/yb-voyager/src/issue"
 	"github.com/yugabyte/yb-voyager/yb-voyager/src/ybversion"
+	testutils "github.com/yugabyte/yb-voyager/yb-voyager/test/utils"
 )
 
 var (
@@ -56,15 +59,9 @@ func getConn() (*pgx.Conn, error) {
 	return conn, nil
 }
 
-func fatalIfError(t *testing.T, err error) {
-	if err != nil {
-		t.Fatalf("error: %v", err)
-	}
-}
-
 func assertErrorCorrectlyThrownForIssueForYBVersion(t *testing.T, execErr error, expectedError string, issue issue.Issue) {
 	isFixed, err := issue.IsFixedIn(testYbVersion)
-	fatalIfError(t, err)
+	testutils.FatalIfError(t, err)
 
 	if isFixed {
 		assert.NoError(t, execErr)
@@ -247,7 +244,7 @@ func TestDDLIssuesInYBVersion(t *testing.T) {
 
 	ybVersionWithoutBuild := strings.Split(ybVersion, "-")[0]
 	testYbVersion, err = ybversion.NewYBVersion(ybVersionWithoutBuild)
-	fatalIfError(t, err)
+	testutils.FatalIfError(t, err)
 
 	testYugabytedbConnStr = os.Getenv("YB_CONN_STR")
 	if testYugabytedbConnStr == "" {
diff --git a/yb-voyager/src/query/queryissue/issues_dml_test.go b/yb-voyager/src/query/queryissue/issues_dml_test.go
index 5b0cd0151b..32902d34a9 100644
--- a/yb-voyager/src/query/queryissue/issues_dml_test.go
+++ b/yb-voyager/src/query/queryissue/issues_dml_test.go
@@ -1,3 +1,5 @@
+//go:build issues_integration
+
 /*
 Copyright (c) YugabyteDB, Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +25,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/testcontainers/testcontainers-go/modules/yugabytedb"
+	testutils "github.com/yugabyte/yb-voyager/yb-voyager/test/utils"
 
 	"github.com/yugabyte/yb-voyager/yb-voyager/src/ybversion"
 )
@@ -123,7 +126,7 @@ func TestDMLIssuesInYBVersion(t *testing.T) {
 
 	ybVersionWithoutBuild := strings.Split(ybVersion, "-")[0]
 	testYbVersion, err = ybversion.NewYBVersion(ybVersionWithoutBuild)
-	fatalIfError(t, err)
+	testutils.FatalIfError(t, err)
 
 	testYugabytedbConnStr = os.Getenv("YB_CONN_STR")
 	if testYugabytedbConnStr == "" {
diff --git a/yb-voyager/src/query/queryissue/parser_issue_detector_test.go b/yb-voyager/src/query/queryissue/parser_issue_detector_test.go
index 1450f4edd8..4fec994d1b 100644
--- a/yb-voyager/src/query/queryissue/parser_issue_detector_test.go
+++ b/yb-voyager/src/query/queryissue/parser_issue_detector_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
@@ -23,6 +25,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
+	testutils "github.com/yugabyte/yb-voyager/yb-voyager/test/utils"
 
 	"github.com/yugabyte/yb-voyager/yb-voyager/src/ybversion"
 )
@@ -308,12 +311,12 @@ func TestUnloggedTableIssueReportedInOlderVersion(t *testing.T) {
 
 	// Not reported by default
 	issues, err := parserIssueDetector.GetDDLIssues(stmt, ybversion.LatestStable)
-	fatalIfError(t, err)
+	testutils.FatalIfError(t, err)
 	assert.Equal(t, 0, len(issues))
 
 	// older version should report the issue
 	issues, err = parserIssueDetector.GetDDLIssues(stmt, ybversion.V2024_1_0_0)
-	fatalIfError(t, err)
+	testutils.FatalIfError(t, err)
 	assert.Equal(t, 1, len(issues))
 	assert.True(t, cmp.Equal(issues[0], NewUnloggedTableIssue("TABLE", "tbl_unlog", stmt)))
 }
@@ -488,7 +491,7 @@ func TestSingleXMLIssueIsDetected(t *testing.T) {
 
 	parserIssueDetector := NewParserIssueDetector()
 	issues, err := parserIssueDetector.getDMLIssues(stmt)
-	fatalIfError(t, err)
+	testutils.FatalIfError(t, err)
 	assert.Equal(t, 1, len(issues))
 }
 
@@ -543,7 +546,7 @@ FROM books;`,
 		`SELECT id, JSON_VALUE(details, '$.title') AS title
 FROM books
 WHERE JSON_EXISTS(details, '$.price ? (@ > $price)' PASSING 30 AS price);`,
-`CREATE MATERIALIZED VIEW public.test_jsonb_view AS
+		`CREATE MATERIALIZED VIEW public.test_jsonb_view AS
 SELECT 
     id,
     data->>'name' AS name,
@@ -556,7 +559,7 @@ JSON_TABLE(data, '$.skills[*]'
         skill TEXT PATH '$'
     )
 ) AS jt;`,
- `SELECT JSON_ARRAY($1, 12, TRUE, $2) AS json_array;`,
+		`SELECT JSON_ARRAY($1, 12, TRUE, $2) AS json_array;`,
 	}
 	sqlsWithExpectedIssues := map[string][]QueryIssue{
 		sqls[0]: []QueryIssue{
@@ -636,14 +639,14 @@ func TestRegexFunctionsIssue(t *testing.T) {
 
 	for _, stmt := range dmlStmts {
 		issues, err := parserIssueDetector.getDMLIssues(stmt)
-		fatalIfError(t, err)
+		testutils.FatalIfError(t, err)
 		assert.Equal(t, 1, len(issues))
 		assert.Equal(t, NewRegexFunctionsIssue(DML_QUERY_OBJECT_TYPE, "", stmt), issues[0])
 	}
 
 	for _, stmt := range ddlStmts {
 		issues, err := parserIssueDetector.getDDLIssues(stmt)
-		fatalIfError(t, err)
+		testutils.FatalIfError(t, err)
 		assert.Equal(t, 1, len(issues))
 		assert.Equal(t, NewRegexFunctionsIssue(TABLE_OBJECT_TYPE, "x", stmt), issues[0])
 	}
diff --git a/yb-voyager/src/query/queryparser/traversal_test.go b/yb-voyager/src/query/queryparser/traversal_test.go
index 9e0f73d61e..6e65579719 100644
--- a/yb-voyager/src/query/queryparser/traversal_test.go
+++ b/yb-voyager/src/query/queryparser/traversal_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/tgtdb/attr_name_registry_test.go b/yb-voyager/src/tgtdb/attr_name_registry_test.go
index 8b656336fe..3655e477d0 100644
--- a/yb-voyager/src/tgtdb/attr_name_registry_test.go
+++ b/yb-voyager/src/tgtdb/attr_name_registry_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package tgtdb
 
 import (
diff --git a/yb-voyager/src/tgtdb/conn_pool_test.go b/yb-voyager/src/tgtdb/conn_pool_test.go
index 7d4ce43805..55053950d1 100644
--- a/yb-voyager/src/tgtdb/conn_pool_test.go
+++ b/yb-voyager/src/tgtdb/conn_pool_test.go
@@ -1,3 +1,5 @@
+//go:build integration
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/tgtdb/main_test.go b/yb-voyager/src/tgtdb/main_test.go
index 46cc2150e2..ea95391485 100644
--- a/yb-voyager/src/tgtdb/main_test.go
+++ b/yb-voyager/src/tgtdb/main_test.go
@@ -1,3 +1,5 @@
+//go:build integration
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/tgtdb/postgres_test.go b/yb-voyager/src/tgtdb/postgres_test.go
index e0e9bd60c5..9bb3d563ef 100644
--- a/yb-voyager/src/tgtdb/postgres_test.go
+++ b/yb-voyager/src/tgtdb/postgres_test.go
@@ -1,3 +1,5 @@
+//go:build integration
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/tgtdb/suites/yugabytedbSuite_test.go b/yb-voyager/src/tgtdb/suites/yugabytedbSuite_test.go
index 834263a61e..8f51d621b2 100644
--- a/yb-voyager/src/tgtdb/suites/yugabytedbSuite_test.go
+++ b/yb-voyager/src/tgtdb/suites/yugabytedbSuite_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/tgtdb/yugabytedb_test.go b/yb-voyager/src/tgtdb/yugabytedb_test.go
index 755ed46d67..e310877a92 100644
--- a/yb-voyager/src/tgtdb/yugabytedb_test.go
+++ b/yb-voyager/src/tgtdb/yugabytedb_test.go
@@ -1,3 +1,5 @@
+//go:build integration
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/utils/jsonfile/jsonfile_test.go b/yb-voyager/src/utils/jsonfile/jsonfile_test.go
index 8818734334..a0f20b57e0 100644
--- a/yb-voyager/src/utils/jsonfile/jsonfile_test.go
+++ b/yb-voyager/src/utils/jsonfile/jsonfile_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package jsonfile
 
 import (
diff --git a/yb-voyager/src/utils/sqlname/nametuple_test.go b/yb-voyager/src/utils/sqlname/nametuple_test.go
index 5e7dc33ebf..b89ade4c8d 100644
--- a/yb-voyager/src/utils/sqlname/nametuple_test.go
+++ b/yb-voyager/src/utils/sqlname/nametuple_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/src/utils/struct_map_test.go b/yb-voyager/src/utils/struct_map_test.go
index 788251706e..c41f90a7d7 100644
--- a/yb-voyager/src/utils/struct_map_test.go
+++ b/yb-voyager/src/utils/struct_map_test.go
@@ -1,3 +1,20 @@
+//go:build unit
+
+/*
+Copyright (c) YugabyteDB, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package utils
 
 import (
diff --git a/yb-voyager/src/ybversion/yb_version_test.go b/yb-voyager/src/ybversion/yb_version_test.go
index 0e53526751..e5e67b04ef 100644
--- a/yb-voyager/src/ybversion/yb_version_test.go
+++ b/yb-voyager/src/ybversion/yb_version_test.go
@@ -1,3 +1,5 @@
+//go:build unit
+
 /*
 Copyright (c) YugabyteDB, Inc.
 
diff --git a/yb-voyager/test/utils/testutils.go b/yb-voyager/test/utils/testutils.go
index 74c30bc446..942e00fd67 100644
--- a/yb-voyager/test/utils/testutils.go
+++ b/yb-voyager/test/utils/testutils.go
@@ -400,3 +400,9 @@ func WaitForDBToBeReady(db *sql.DB) error {
 	}
 	return fmt.Errorf("database did not become ready in time")
 }
+
+func FatalIfError(t *testing.T, err error) {
+	if err != nil {
+		t.Fatalf("error: %v", err)
+	}
+}