diff --git a/Scripts/spring_petclinic_jdbc_conf.sh b/Scripts/spring_petclinic_jdbc_conf.sh
index 89734ac7e..b13dbc425 100644
--- a/Scripts/spring_petclinic_jdbc_conf.sh
+++ b/Scripts/spring_petclinic_jdbc_conf.sh
@@ -8,7 +8,9 @@ mkdir -p $TMPDIR/petclinic
 unzip /tmp/petclinic.war -d $TMPDIR/petclinic
 
 
-sed -e "s/\${HOSTNAME}/$1/g" \
+sed -e "/# HSQL/,/# MySQL/ s/^/#/g" \
+    -e "/# MySQL/,$ s/^#\([jh]\)/\1/g" \
+    -e "s/\${HOSTNAME}/$1/g" \
     -e "s/\${SERNAME}/$2/g" \
     -e "s/\${PASSWORD}/$3/g" $PROPFILE > /tmp/jdbc.tmp$$
 
diff --git a/src/main/resources/spring/data-access.properties b/src/main/resources/spring/data-access.properties
index 0f6e29f86..4b1c16d53 100644
--- a/src/main/resources/spring/data-access.properties
+++ b/src/main/resources/spring/data-access.properties
@@ -7,35 +7,36 @@
 #-------------------------------------------------------------------------------
 # HSQL Settings
 
-#jdbc.driverClassName=org.hsqldb.jdbcDriver
-#jdbc.url=jdbc:hsqldb:mem:petclinic
-#jdbc.username=sa
-#jdbc.password=
+jdbc.driverClassName=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:mem:petclinic
+jdbc.username=sa
+jdbc.password=
 
 # Properties that control the population of schema and data for a new data source
-#jdbc.initLocation=classpath:db/hsqldb/initDB.sql
-#jdbc.dataLocation=classpath:db/hsqldb/populateDB.sql
+jdbc.initLocation=classpath:db/hsqldb/initDB.sql
+jdbc.dataLocation=classpath:db/hsqldb/populateDB.sql
 
 # Property that determines which database to use with an AbstractJpaVendorAdapter
-#jpa.database=HSQL
+jpa.database=HSQL
 
-#jpa.showSql=true
+jpa.showSql=true
 
 #-------------------------------------------------------------------------------
 # MySQL Settings
 
-jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://${HOSTNAME}:3306/petclinic
-jdbc.username=${USERNAME}
-jdbc.password=${PASSWORD}
+#jdbc.driverClassName=com.mysql.jdbc.Driver
+#jdbc.url=jdbc:mysql://${HOSTNAME}:3306/petclinic
+#jdbc.username=${USERNAME}
+#jdbc.password=${PASSWORD}
 
 # Properties that control the population of schema and data for a new data source
-jdbc.initLocation=classpath:db/mysql/initDB.sql
-jdbc.dataLocation=classpath:db/mysql/populateDB.sql
+#jdbc.initLocation=classpath:db/mysql/initDB.sql
+#jdbc.dataLocation=classpath:db/mysql/populateDB.sql
 
 # Property that determines which Hibernate dialect to use
 # (only applied with "applicationContext-hibernate.xml")
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
+#hibernate.dialect=org.hibernate.dialect.MySQLDialect
 
 # Property that determines which database to use with an AbstractJpaVendorAdapter
-jpa.database=MYSQL
+#jpa.database=MYSQL
+# END
\ No newline at end of file