diff --git a/.github/configuration/upgrade-test-configuration.yml b/.github/configuration/upgrade-test-configuration.yml
index be1cbbce458..770f08179a0 100644
--- a/.github/configuration/upgrade-test-configuration.yml
+++ b/.github/configuration/upgrade-test-configuration.yml
@@ -166,6 +166,18 @@ upgrade-version: [{
     }
   ]
 },
+{
+  upgrade-path: [
+    {
+      version: 17.4,
+      upgrade-type: null
+    },
+    { 
+      version: target.latest,
+      upgrade-type: major
+    }
+  ]
+},
 {
   upgrade-path: [
     {
diff --git a/test/JDBC/expected/test_constraint_like-17-4-or-16-8-vu-verify.out b/test/JDBC/expected/test_constraint_like-17-4-or-16-8-vu-verify.out
index e91e048a70b..ef79e69614b 100644
--- a/test/JDBC/expected/test_constraint_like-17-4-or-16-8-vu-verify.out
+++ b/test/JDBC/expected/test_constraint_like-17-4-or-16-8-vu-verify.out
@@ -530,7 +530,7 @@ SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conrelid = 'master_dbo
 GO
 ~~START~~
 text
-CHECK (((('abc'::text COLLATE sys.bbf_unicode_cp1_ci_as) ~~* 'A%'::text) AND ((('abc'::text COLLATE sys.bbf_unicode_cp1_ci_as) >= 'A'::text) AND (('abc'::text COLLATE sys.bbf_unicode_cp1_ci_as) < ('A'::text || '￿'::text COLLATE sys.bbf_unicode_cp1_ci_as)))))
+CHECK (((('abc'::text COLLATE sys.bbf_unicode_cp1_ci_as) ~~* 'A%'::text) AND ((('abc'::text COLLATE sys.bbf_unicode_cp1_ci_as) >= 'A'::text) AND (('abc'::text COLLATE sys.bbf_unicode_cp1_ci_as) < ('A'::text || ('￿'::text COLLATE sys.bbf_unicode_cp1_ci_as))))))
 ~~END~~
 
 
@@ -556,7 +556,7 @@ SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conrelid = 'master_dbo
 GO
 ~~START~~
 text
-CHECK ((((babel_5608_vu_prepare_t4_2_col1)::text ~~* 'a%'::text) AND (((babel_5608_vu_prepare_t4_2_col1)::text >= 'a'::text) AND ((babel_5608_vu_prepare_t4_2_col1)::text < ('a'::text || '￿'::text COLLATE sys.bbf_unicode_cp1_ci_as)))))
+CHECK ((((babel_5608_vu_prepare_t4_2_col1)::text ~~* 'a%'::text) AND (((babel_5608_vu_prepare_t4_2_col1)::text >= 'a'::text) AND ((babel_5608_vu_prepare_t4_2_col1)::text < ('a'::text || ('￿'::text COLLATE sys.bbf_unicode_cp1_ci_as))))))
 ~~END~~
 
 
@@ -599,7 +599,7 @@ SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conrelid = 'master_dbo
 GO
 ~~START~~
 text
-CHECK ((((sys.remove_accents_internal(((babel_5608_vu_prepare_t7_2_col1)::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text ~~* 'a%'::text) AND (((sys.remove_accents_internal(((babel_5608_vu_prepare_t7_2_col1)::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text >= 'a'::text) AND ((sys.remove_accents_internal(((babel_5608_vu_prepare_t7_2_col1)::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text < ('a'::text || '￿'::text COLLATE sys.bbf_unicode_cp1_ci_ai)))))
+CHECK ((((sys.remove_accents_internal(((babel_5608_vu_prepare_t7_2_col1)::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text ~~* 'a%'::text) AND (((sys.remove_accents_internal(((babel_5608_vu_prepare_t7_2_col1)::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text >= 'a'::text) AND ((sys.remove_accents_internal(((babel_5608_vu_prepare_t7_2_col1)::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text < ('a'::text || ('￿'::text COLLATE sys.bbf_unicode_cp1_ci_ai))))))
 ~~END~~
 
 
@@ -633,7 +633,7 @@ SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conrelid = 'master_dbo
 GO
 ~~START~~
 text
-CHECK ((((sys.lower(babel_5608_vu_prepare_t9_2_col1))::text ~~* 'a%'::text) AND (((sys.lower(babel_5608_vu_prepare_t9_2_col1))::text >= 'a'::text) AND ((sys.lower(babel_5608_vu_prepare_t9_2_col1))::text < ('a'::text || '￿'::text COLLATE sys.bbf_unicode_cp1_ci_as)))))
+CHECK ((((sys.lower(babel_5608_vu_prepare_t9_2_col1))::text ~~* 'a%'::text) AND (((sys.lower(babel_5608_vu_prepare_t9_2_col1))::text >= 'a'::text) AND ((sys.lower(babel_5608_vu_prepare_t9_2_col1))::text < ('a'::text || ('￿'::text COLLATE sys.bbf_unicode_cp1_ci_as))))))
 ~~END~~
 
 
@@ -649,7 +649,7 @@ SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conrelid = 'master_dbo
 GO
 ~~START~~
 text
-CHECK ((((sys.remove_accents_internal((sys.lower((babel_5608_vu_prepare_t9_4_col1 COLLATE sys.bbf_unicode_cp1_ci_ai)))::text))::text ~~* 'a%'::text) AND (((sys.remove_accents_internal((sys.lower((babel_5608_vu_prepare_t9_4_col1 COLLATE sys.bbf_unicode_cp1_ci_ai)))::text))::text >= 'a'::text) AND ((sys.remove_accents_internal((sys.lower((babel_5608_vu_prepare_t9_4_col1 COLLATE sys.bbf_unicode_cp1_ci_ai)))::text))::text < ('a'::text || '￿'::text COLLATE sys.bbf_unicode_cp1_ci_ai)))))
+CHECK ((((sys.remove_accents_internal((sys.lower((babel_5608_vu_prepare_t9_4_col1 COLLATE sys.bbf_unicode_cp1_ci_ai)))::text))::text ~~* 'a%'::text) AND (((sys.remove_accents_internal((sys.lower((babel_5608_vu_prepare_t9_4_col1 COLLATE sys.bbf_unicode_cp1_ci_ai)))::text))::text >= 'a'::text) AND ((sys.remove_accents_internal((sys.lower((babel_5608_vu_prepare_t9_4_col1 COLLATE sys.bbf_unicode_cp1_ci_ai)))::text))::text < ('a'::text || ('￿'::text COLLATE sys.bbf_unicode_cp1_ci_ai))))))
 ~~END~~
 
 
@@ -665,7 +665,7 @@ SELECT pg_get_constraintdef(oid) FROM pg_constraint WHERE conrelid = 'master_dbo
 GO
 ~~START~~
 text
-CHECK ((((sys.remove_accents_internal(((sys.lower(babel_5608_vu_prepare_t9_6_col1))::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text ~~* 'a%'::text) AND (((sys.remove_accents_internal(((sys.lower(babel_5608_vu_prepare_t9_6_col1))::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text >= 'a'::text) AND ((sys.remove_accents_internal(((sys.lower(babel_5608_vu_prepare_t9_6_col1))::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text < ('a'::text || '￿'::text COLLATE sys.bbf_unicode_cp1_ci_ai)))))
+CHECK ((((sys.remove_accents_internal(((sys.lower(babel_5608_vu_prepare_t9_6_col1))::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text ~~* 'a%'::text) AND (((sys.remove_accents_internal(((sys.lower(babel_5608_vu_prepare_t9_6_col1))::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text >= 'a'::text) AND ((sys.remove_accents_internal(((sys.lower(babel_5608_vu_prepare_t9_6_col1))::text COLLATE sys.bbf_unicode_cp1_ci_ai)))::text < ('a'::text || ('￿'::text COLLATE sys.bbf_unicode_cp1_ci_ai))))))
 ~~END~~
 
 
diff --git a/test/JDBC/upgrade/17_4/schedule b/test/JDBC/upgrade/17_4/schedule
index 89a6869ece7..bf099dad22e 100644
--- a/test/JDBC/upgrade/17_4/schedule
+++ b/test/JDBC/upgrade/17_4/schedule
@@ -630,7 +630,6 @@ view_sec_setting_before_17_6-or-16_10
 alter-table-null-notnull
 babel_binary-before-17_5-or-16_9
 ascii_function_before-17_7-or-16_11
-cast_string_to_binary-before-17_7
 cast_binary_to_string-before-17_7
 test_conv_text_to_binary-before-17_7
 test_conv_text_to_string