diff --git a/yb-voyager/src/query/queryissue/issues_ddl_test.go b/yb-voyager/src/query/queryissue/issues_ddl_test.go
index 7e8c5331cd..8544bd5161 100644
--- a/yb-voyager/src/query/queryissue/issues_ddl_test.go
+++ b/yb-voyager/src/query/queryissue/issues_ddl_test.go
@@ -169,14 +169,14 @@ func testClusterOnIssue(t *testing.T) {
 
 	ALTER TABLE public.test CLUSTER ON test_age_salary`)
 
-	fmt.Printf("%s", testYbVersion)
 	var errMsg string
-	switch testYbVersion {
-	case ybversion.V2_25_0_0:
+	switch testYbVersion.String() {
+	case ybversion.V2_25_0_0.String():
 		errMsg = "ALTER action CLUSTER ON not supported yet"
 	default:
 		errMsg = "ALTER TABLE CLUSTER not supported yet"
 	}
+	fmt.Printf("version -%v, match - %v, errorMSG - %s", testYbVersion, testYbVersion.String() == ybversion.V2_25_0_0.String(), errMsg)
 	assertErrorCorrectlyThrownForIssueForYBVersion(t, err, errMsg, alterTableClusterOnIssue)
 }
 
diff --git a/yb-voyager/src/query/queryissue/issues_dml_test.go b/yb-voyager/src/query/queryissue/issues_dml_test.go
index f400e6ecc3..2f06a5b2be 100644
--- a/yb-voyager/src/query/queryissue/issues_dml_test.go
+++ b/yb-voyager/src/query/queryissue/issues_dml_test.go
@@ -357,8 +357,9 @@ func testCTEWithMaterializedIssue(t *testing.T) {
 		SELECT * FROM big_table
 	)
 	SELECT * FROM w AS w1 JOIN w AS w2 ON w1.key = w2.ref
-	WHERE w2.key = ''123;`: `syntax error at or near "NOT"`,
-		`WITH w AS MATERIALIZED (
+	WHERE w2.key = '123';`: `syntax error at or near "NOT"`,
+		`CREATE TABLE big_table(key text, ref text, c1 int, c2 int);
+		WITH w AS MATERIALIZED (
 		SELECT * FROM big_table
 	)
 	SELECT * FROM w AS w1 JOIN w AS w2 ON w1.key = w2.ref