diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
index 4c612dec5..1d69fc25c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
@@ -20,12 +20,12 @@
 
 package org.navalplanner.business.costcategories.entities;
 
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.hibernate.validator.AssertTrue;
 import org.hibernate.validator.NotEmpty;
+import org.joda.time.LocalDate;
 import org.navalplanner.business.common.BaseEntity;
 
 /**
@@ -77,8 +77,8 @@ public class CostCategory extends BaseEntity {
 
     public boolean canAddHourCost(HourCost hourCost) {
         boolean overlap = false;
-        Date initDate = hourCost.getInitDate();
-        Date endDate = hourCost.getEndDate();
+        LocalDate initDate = hourCost.getInitDate();
+        LocalDate endDate = hourCost.getEndDate();
         for(HourCost listElement:hourCosts) {
             if((listElement.getEndDate().compareTo(initDate)>=0 && listElement.getEndDate().compareTo(endDate)<=0) ||
                (listElement.getInitDate().compareTo(initDate)>=0 && listElement.getInitDate().compareTo(endDate)<=0))
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java
index be528f0cc..6d28d9b6f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java
@@ -21,9 +21,9 @@
 package org.navalplanner.business.costcategories.entities;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 import org.hibernate.validator.NotNull;
+import org.joda.time.LocalDate;
 import org.navalplanner.business.common.BaseEntity;
 
 /**
@@ -35,9 +35,9 @@ public class HourCost extends BaseEntity {
     private BigDecimal priceCost;
 
     @NotNull
-    private Date initDate;
+    private LocalDate initDate;
 
-    private Date endDate;
+    private LocalDate endDate;
 
     @NotNull
     private TypeOfWorkHours type;
@@ -50,11 +50,11 @@ public class HourCost extends BaseEntity {
 
     }
 
-    public static HourCost create(BigDecimal priceCost, Date initDate) {
+    public static HourCost create(BigDecimal priceCost, LocalDate initDate) {
         return (HourCost) create(new HourCost(priceCost, initDate));
     }
 
-    protected HourCost(BigDecimal priceCost, Date initDate) {
+    protected HourCost(BigDecimal priceCost, LocalDate initDate) {
         this.priceCost = priceCost;
         this.initDate = initDate;
     }
@@ -67,19 +67,19 @@ public class HourCost extends BaseEntity {
         this.priceCost = priceCost;
     }
 
-    public Date getInitDate() {
+    public LocalDate getInitDate() {
         return initDate;
     }
 
-    public void setInitDate(Date initDate) {
+    public void setInitDate(LocalDate initDate) {
         this.initDate = initDate;
     }
 
-    public Date getEndDate() {
+    public LocalDate getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Date endDate) {
+    public void setEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
 
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml
index 4df07a07d..7d86565b7 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml
@@ -30,9 +30,9 @@
 
     <property name="priceCost" unique="true"/>
 
-    <property name="initDate"/>
+    <property name="initDate" type="org.joda.time.contrib.hibernate.PersistentLocalDate"/>
 
-    <property name="endDate"/>
+    <property name="endDate" type="org.joda.time.contrib.hibernate.PersistentLocalDate"/>
 
     <many-to-one name="type" class="TypeOfWorkHours" column="TYPE_OF_WORK_HOURS_ID" />
 
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java
index 19dd74d15..aa1f0f6b6 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/CostCategoryDAOTest.java
@@ -29,10 +29,10 @@ import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONF
 import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
+import org.joda.time.LocalDate;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
@@ -96,31 +96,31 @@ public class CostCategoryDAOTest {
     @Test
     public void testCanAddHourCost() {
         CostCategory costCategory = createValidCostCategory();
-        HourCost hourCost1 = HourCost.create(BigDecimal.ONE, new Date(2009, 11,1));
-        hourCost1.setEndDate(new Date(2009, 11,10));
+        HourCost hourCost1 = HourCost.create(BigDecimal.ONE, new LocalDate(2009, 11,1));
+        hourCost1.setEndDate(new LocalDate(2009, 11,10));
         costCategory.addHourCost(hourCost1);
 
-        HourCost hourCost2 = HourCost.create(BigDecimal.ONE, new Date(2009, 11,1));
-        hourCost2.setEndDate(new Date(2009, 11,10));
+        HourCost hourCost2 = HourCost.create(BigDecimal.ONE, new LocalDate(2009, 11,1));
+        hourCost2.setEndDate(new LocalDate(2009, 11,10));
         assertFalse(costCategory.canAddHourCost(hourCost2));
 
-        hourCost2.setInitDate(new Date(2009,10,15));
-        hourCost2.setEndDate(new Date(2009,11,1));
+        hourCost2.setInitDate(new LocalDate(2009,10,15));
+        hourCost2.setEndDate(new LocalDate(2009,11,1));
         assertFalse(costCategory.canAddHourCost(hourCost2));
 
-        hourCost2.setInitDate(new Date(2009,11,10));
-        hourCost2.setEndDate(new Date(2009,11,10));
+        hourCost2.setInitDate(new LocalDate(2009,11,10));
+        hourCost2.setEndDate(new LocalDate(2009,11,10));
         assertFalse(costCategory.canAddHourCost(hourCost2));
 
-        hourCost2.setInitDate(new Date(2009,10,15));
-        hourCost2.setEndDate(new Date(2009,10,20));
+        hourCost2.setInitDate(new LocalDate(2009,10,15));
+        hourCost2.setEndDate(new LocalDate(2009,10,20));
         assertTrue(costCategory.canAddHourCost(hourCost2));
     }
 
     @Test
     public void testListHourCosts() {
         CostCategory costCategory = createValidCostCategory();
-        HourCost hourCost = HourCost.create(BigDecimal.ONE, new Date(2009,11,1));
+        HourCost hourCost = HourCost.create(BigDecimal.ONE, new LocalDate(2009,11,1));
         int previous = costCategory.getHourCosts().size();
 
         costCategory.addHourCost(hourCost);
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java
index b7a217b32..70a8ca848 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/costcategories/daos/HourCostDAOTest.java
@@ -28,10 +28,10 @@ import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONF
 import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_TEST_FILE;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
+import org.joda.time.LocalDate;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
@@ -73,7 +73,8 @@ public class HourCostDAOTest {
     }
 
     private HourCost createValidHourCost() {
-        HourCost hourCost = HourCost.create(BigDecimal.ONE, new Date());
+        HourCost hourCost = HourCost.create(BigDecimal.ONE, new LocalDate());
+
         TypeOfWorkHours type =
                 TypeOfWorkHours.create(UUID.randomUUID().toString(), UUID.randomUUID().toString());
         hourCost.setType(type);