diff --git a/util/internal/integrationtest/mapper/orm/src/main/resources/hibernate.properties b/util/internal/integrationtest/mapper/orm/src/main/resources/hibernate.properties
index d866f45e6d8..e5542dbbc19 100644
--- a/util/internal/integrationtest/mapper/orm/src/main/resources/hibernate.properties
+++ b/util/internal/integrationtest/mapper/orm/src/main/resources/hibernate.properties
@@ -25,3 +25,10 @@ hibernate.cache.region.factory_class = org.hibernate.testing.cache.CachingRegion
 
 hibernate.implicit_naming_strategy = component-path
 
+# Temporary workaround for:
+# - https://hibernate.atlassian.net/browse/HHH-15054
+#   (affects org/hibernate/search/test/proxy/ProxyTest)
+# - https://hibernate.atlassian.net/browse/HHH-15058
+#   (affects tests in org/hibernate/search/integrationtest/mapper/orm/automaticindexing/association/bytype/manytomany,
+#   in particular)
+hibernate.mapping.default_list_semantics=bag