diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/serializer-snapshot
new file mode 100644
index 00000000000000..976c3c220a4043
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/test-data
similarity index 100%
rename from flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/test-data
rename to flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/test-data
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/serializer-snapshot
new file mode 100644
index 00000000000000..976c3c220a4043
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/test-data
similarity index 100%
rename from flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/test-data
rename to flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/test-data
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/serializer-snapshot
new file mode 100644
index 00000000000000..976c3c220a4043
Binary files /dev/null and b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/serializer-snapshot differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/test-data
similarity index 100%
rename from flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/test-data
rename to flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/test-data
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/serializer-snapshot
deleted file mode 100644
index 5b74ce2bb36b29..00000000000000
Binary files a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/serializer-snapshot and /dev/null differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/serializer-snapshot
deleted file mode 100644
index 5b74ce2bb36b29..00000000000000
Binary files a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/serializer-snapshot and /dev/null differ
diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot
deleted file mode 100644
index 5b74ce2bb36b29..00000000000000
Binary files a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot and /dev/null differ
diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala
index 2a89f5f78234e1..d9d531ae879918 100644
--- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala
+++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala
@@ -28,7 +28,6 @@ import org.apache.flink.table.api.typeutils.TraversableSerializerUpgradeTest.Typ
 import org.apache.flink.test.util.MigrationTest
 
 import org.assertj.core.api.Condition
-import org.junit.jupiter.api.Disabled
 
 import java.util
 import java.util.Objects
@@ -37,7 +36,6 @@ import java.util.function.Supplier
 import scala.collection.{mutable, BitSet, LinearSeq}
 
 /** A [[TypeSerializerUpgradeTestBase]] for [[TraversableSerializer]]. */
-@Disabled("FLINK-36334")
 class TraversableSerializerUpgradeTest
   extends TypeSerializerUpgradeTestBase[TraversableOnce[_], TraversableOnce[_]] {
 
@@ -71,10 +69,10 @@ class TraversableSerializerUpgradeTest
         classOf[MapSerializerVerifier]))
     testSpecifications.add(
       new TestSpecification[mutable.ListBuffer[Int], mutable.ListBuffer[Int]](
-        "traversable-serializer-mutable-list",
+        "traversable-serializer-list-buffer",
         migrationVersion,
-        classOf[MutableListSerializerSetup],
-        classOf[MutableListSerializerVerifier]))
+        classOf[ListBufferSerializerSetup],
+        classOf[ListBufferSerializerVerifier]))
     testSpecifications.add(
       new TestSpecification[Seq[Int], Seq[Int]](
         "traversable-serializer-seq",
@@ -130,7 +128,7 @@ object TraversableSerializerUpgradeTest {
     val mapTypeInfo = implicitly[TypeInformation[Map[String, Int]]]
     val setTypeInfo = implicitly[TypeInformation[Set[Int]]]
     val bitsetTypeInfo = implicitly[TypeInformation[BitSet]]
-    val mutableListTypeInfo =
+    val listBufferTypeInfo =
       implicitly[TypeInformation[mutable.ListBuffer[Int]]]
     val seqTupleTypeInfo = implicitly[TypeInformation[Seq[(Int, String)]]]
     val seqPojoTypeInfo = implicitly[TypeInformation[Seq[Pojo]]]
@@ -224,18 +222,18 @@ object TraversableSerializerUpgradeTest {
       TypeSerializerConditions.isCompatibleAsIs[Map[String, Int]]()
   }
 
-  final class MutableListSerializerSetup
+  final class ListBufferSerializerSetup
     extends TypeSerializerUpgradeTestBase.PreUpgradeSetup[mutable.ListBuffer[Int]] {
     override def createPriorSerializer: TypeSerializer[mutable.ListBuffer[Int]] =
-      new TypeSerializerSupplier(mutableListTypeInfo).get()
+      new TypeSerializerSupplier(listBufferTypeInfo).get()
 
     override def createTestData: mutable.ListBuffer[Int] = mutable.ListBuffer(1, 2, 3)
   }
 
-  final class MutableListSerializerVerifier
+  final class ListBufferSerializerVerifier
     extends TypeSerializerUpgradeTestBase.UpgradeVerifier[mutable.ListBuffer[Int]] {
     override def createUpgradedSerializer: TypeSerializer[mutable.ListBuffer[Int]] =
-      new TypeSerializerSupplier(mutableListTypeInfo).get()
+      new TypeSerializerSupplier(listBufferTypeInfo).get()
 
     override def testDataCondition: Condition[mutable.ListBuffer[Int]] =
       new Condition[mutable.ListBuffer[Int]](