diff --git data/conf/hive-site.xml data/conf/hive-site.xml
index 9f6aec178d..29a4026dbd 100644
--- data/conf/hive-site.xml
+++ data/conf/hive-site.xml
@@ -69,6 +69,19 @@
+ metastore.create.as.acid
+ true
+
+
+ hive.txn.manager
+ org.apache.hadoop.hive.ql.lockmgr.DbTxnManager
+
+
+ hive.exec.dynamic.partition.mode
+ nonstrict
+
+
+
javax.jdo.option.ConnectionURL
jdbc:derby:memory:${test.tmp.dir}/junit_metastore_db;create=true