diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
index 2aeacbbfa5..364e43e2bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java
@@ -312,6 +312,9 @@ public class SybaseDialect extends AbstractTransactSQLDialect {
 
 	@Override
 	public NameQualifierSupport getNameQualifierSupport() {
+		if ( version >= 1500 ) {
+			return NameQualifierSupport.BOTH;
+		}
 		return NameQualifierSupport.CATALOG;
 	}
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java
index 365a6c6f8f..b61fdd70d6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/cleaner/JdbcConnectionContext.java
@@ -38,8 +38,12 @@ public final class JdbcConnectionContext {
 			password = connectionProperties.getProperty(
 					AvailableSettings.PASS );
 			Properties p = new Properties();
-			p.put( "user", user );
-			p.put( "password", password );
+			if ( user != null ) {
+				p.put( "user", user );
+			}
+			if ( password != null ) {
+				p.put( "password", password );
+			}
 			properties = p;
 		}
 		catch (Exception e) {