diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java
index f3d448676a..acf5053ff3 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java
@@ -132,7 +132,7 @@ public class UserTypeComparableIdTest {
 
 		@Override
 		public int[] sqlTypes() {
-			return new int[] { SQL_TYPE.getJdbcTypeCode() };
+			return new int[] { SQL_TYPE.getJdbcTypeDescriptor().getDefaultSqlTypeCode() };
 		}
 
 		@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java
index ad7f2b9d3d..b19f806fea 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java
@@ -119,7 +119,7 @@ public class UserTypeNonComparableIdTest {
 
 		@Override
 		public int[] sqlTypes() {
-			return new int[] { SQL_TYPE.getJdbcTypeCode() };
+			return new int[] { SQL_TYPE.getJdbcTypeDescriptor().getDefaultSqlTypeCode() };
 		}
 
 		@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java
index 418ce7d600..6f544f5560 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/attributeoverrides/AttributeOverrideEnhancedUserTypeTest.java
@@ -107,10 +107,8 @@ public class AttributeOverrideEnhancedUserTypeTest {
 	public static class YearMonthUserType implements UserType, Serializable {
 		@Override
 		public int[] sqlTypes() {
-			return new int[] {
-					IntegerType.INSTANCE.getJdbcTypeCode(),
-					IntegerType.INSTANCE.getJdbcTypeCode(),
-			};
+			int intType = IntegerType.INSTANCE.getJdbcTypeDescriptor().getDefaultSqlTypeCode();
+			return new int[] { intType, intType };
 		}
 
 		@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/MyStringType.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/MyStringType.java
index 487ea7a523..40bd851642 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/MyStringType.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/type/dynamicparameterized/MyStringType.java
@@ -107,7 +107,7 @@ public class MyStringType implements UserType, DynamicParameterizedType {
 
 	@Override
 	public int[] sqlTypes() {
-		return new int[] { StringType.INSTANCE.getJdbcTypeCode() };
+		return new int[] { StringType.INSTANCE.getJdbcTypeDescriptor().getDefaultSqlTypeCode() };
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/test/usertype/StringWrapperUserType.java b/hibernate-core/src/test/java/org/hibernate/test/usertype/StringWrapperUserType.java
index 1dd28bc39c..71b305d671 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/usertype/StringWrapperUserType.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/usertype/StringWrapperUserType.java
@@ -25,7 +25,7 @@ public class StringWrapperUserType implements UserType {
 
     @Override
     public int[] sqlTypes() {
-        return new int[] {StringType.INSTANCE.getJdbcTypeCode()};
+        return new int[] {StringType.INSTANCE.getJdbcTypeDescriptor().getDefaultSqlTypeCode()};
     }
 
     @Override
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java
index 47e589fd14..657dffc0ba 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AgeType.java
@@ -21,7 +21,7 @@ public class AgeType implements UserType {
 	@Override
 	public int[] sqlTypes() {
 		return new int[] {
-				IntegerType.INSTANCE.getJdbcTypeCode()
+				IntegerType.INSTANCE.getJdbcTypeDescriptor().getDefaultSqlTypeCode()
 		};
 	}