diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
index ed719e7b453..a6a8f39bd2d 100644
--- a/mysql-test/main/func_json.result
+++ b/mysql-test/main/func_json.result
@@ -1293,10 +1293,12 @@ ERROR 42000: Incorrect parameter count in the call to native function 'json_leng
 SELECT JSON_LENGTH();
 ERROR 42000: Incorrect parameter count in the call to native function 'JSON_LENGTH'
 # MDEV-23187: Assorted assertion failures in json_find_path with certain collations
+SET @old_collation_connection= @@COLLATION_CONNECTION;
 SET COLLATION_CONNECTION= ucs2_unicode_ci;
 SELECT JSON_VALUE('["foo"]', '$**[0]') AS f;
 f
 foo
+SET @@COLLATION_CONNECTION= @old_collation_connection;
 #
 # End of 10.4 tests
 #
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
index 9cfde5489e7..ef747efb79d 100644
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test
@@ -823,9 +823,13 @@ SELECT JSON_LENGTH();
 --echo # MDEV-23187: Assorted assertion failures in json_find_path with certain collations
 
 
+SET @old_collation_connection= @@COLLATION_CONNECTION;
+
 SET COLLATION_CONNECTION= ucs2_unicode_ci;
 SELECT JSON_VALUE('["foo"]', '$**[0]') AS f;
 
+SET @@COLLATION_CONNECTION= @old_collation_connection;
+
 --echo #
 --echo # End of 10.4 tests
 --echo #