diff --git a/libreplan-business/pom.xml b/libreplan-business/pom.xml
index dd6e64c0d..4e12400ad 100644
--- a/libreplan-business/pom.xml
+++ b/libreplan-business/pom.xml
@@ -32,6 +32,11 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <!-- datasource for testing -->
+        <dependency>
+           <groupId>com.jolbox</groupId>
+           <artifactId>bonecp</artifactId>
+        </dependency>
         <!-- Spring -->
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml b/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml
index 3b48f8430..a28faa52a 100644
--- a/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml
+++ b/libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml
@@ -7,10 +7,17 @@
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
+    <bean id="dataSourceReal"
+        class="com.jolbox.bonecp.BoneCPDataSource" destroy-method="close"
+        p:driverClass="${jdbcDriver.className}" p:jdbcUrl="${testDataSource.url}"
+        p:username="${testDataSource.user}" p:password="${testDataSource.password}"
+        p:maxConnectionsPerPartition="10"
+        p:minConnectionsPerPartition="4"
+        p:partitionCount="3"/>
+
     <bean id="dataSource"
-        class="org.springframework.jdbc.datasource.DriverManagerDataSource"
-        p:driverClassName="${jdbcDriver.className}" p:url="${testDataSource.url}"
-        p:username="${testDataSource.user}" p:password="${testDataSource.password}" />
+            class="org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy"
+            p:targetDataSource-ref="dataSourceReal" />
 
     <!-- Hibernate Session Factory. -->
     <bean id="sessionFactory"
diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml
index 54c9e48ef..fcb261458 100644
--- a/libreplan-webapp/pom.xml
+++ b/libreplan-webapp/pom.xml
@@ -427,6 +427,11 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <!-- datasource for testing -->
+        <dependency>
+           <groupId>com.jolbox</groupId>
+           <artifactId>bonecp</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
diff --git a/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml b/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml
index 7cfe39394..3c630e2f9 100644
--- a/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml
+++ b/libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml
@@ -7,10 +7,17 @@
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
+    <bean id="dataSourceReal"
+        class="com.jolbox.bonecp.BoneCPDataSource" destroy-method="close"
+        p:driverClass="${jdbcDriver.className}" p:jdbcUrl="${testDataSource.url}"
+        p:username="${testDataSource.user}" p:password="${testDataSource.password}"
+        p:maxConnectionsPerPartition="10"
+        p:minConnectionsPerPartition="4"
+        p:partitionCount="3"/>
+
     <bean id="dataSource"
-        class="org.springframework.jdbc.datasource.DriverManagerDataSource"
-        p:driverClassName="${jdbcDriver.className}" p:url="${testDataSource.url}"
-        p:username="${testDataSource.user}" p:password="${testDataSource.password}" />
+            class="org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy"
+            p:targetDataSource-ref="dataSourceReal" />
 
 
     <!-- Hibernate Session Factory. -->
diff --git a/pom.xml b/pom.xml
index 01e369507..ccea5be21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,6 +263,13 @@
                 <version>4.4</version>
                 <scope>test</scope>
             </dependency>
+            <!-- datasource for testing -->
+            <dependency>
+              <groupId>com.jolbox</groupId>
+              <artifactId>bonecp</artifactId>
+              <version>0.7.1.RELEASE</version>
+              <scope>test</scope>
+            </dependency>
 
             <!-- Easy mock -->
             <dependency>