diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
index 55540b4ad9..fd1496a1e3 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
@@ -200,6 +200,9 @@ public abstract class BaseCoreFunctionalTestCase extends BaseFunctionalTestCase
 		properties.put( Environment.CACHE_REGION_FACTORY, CachingRegionFactory.class.getName() );
 		properties.put( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" );
 		properties.put( Environment.DIALECT, getDialect().getClass().getName() );
+		if(createSchema()){
+			properties.put( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
+		}
 		return properties;
 	}