diff --git a/api/src/main/java/org/openmrs/CareSetting.java b/api/src/main/java/org/openmrs/CareSetting.java
index 145a753cbeb..68aa178e6d1 100644
--- a/api/src/main/java/org/openmrs/CareSetting.java
+++ b/api/src/main/java/org/openmrs/CareSetting.java
@@ -9,8 +9,19 @@
  */
 package org.openmrs;
 
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 /**
  * Care Setting defines the scope of care for any piece of data within the medical record. Clinical
  * data (treatments, notes, etc.) apply within their associated care setting. Implementations
@@ -26,6 +37,8 @@
  * 
  * @since 1.10
  */
+@Entity
+@Table(name = "care_setting")
 @Audited
 public class CareSetting extends BaseChangeableOpenmrsMetadata {
 	
@@ -33,9 +46,19 @@ public enum CareSettingType {
 		OUTPATIENT,
 		INPATIENT
 	}
-	
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "care_setting_id_seq")
+	@GenericGenerator(
+		name = "care_setting_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "care_setting_care_setting_id_seq")
+	)
+	@Column(name = "care_setting_id")
 	private Integer careSettingId;
-	
+
+	@Enumerated(EnumType.STRING)
+	@Column(name = "care_setting_type", nullable = false, length = 50)
 	private CareSettingType careSettingType;
 	
 	public CareSetting() {
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc..9849df43813 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -73,7 +73,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/OrderGroup.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderGroupAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderGroupAttributeType.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/CareSetting.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/LocationTag.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/EncounterType.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/CareSetting.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/CareSetting.hbm.xml
deleted file mode 100644
index 755c8d93772..00000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/CareSetting.hbm.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping>
-
-    <class name="org.openmrs.CareSetting" table="care_setting">
-
-        <id name="careSettingId" type="java.lang.Integer" column="care_setting_id" unsaved-value="0">
-            <generator class="native">
-                <param name="sequence">care_setting_care_setting_id_seq</param>
-            </generator>
-        </id>
-
-        <property name="careSettingType" column="care_setting_type" length="50" not-null="true">
-            <type name="org.hibernate.type.EnumType">
-                <param name="enumClass">org.openmrs.CareSetting$CareSettingType</param>
-                <param name="useNamed">true</param>
-            </type>
-        </property>
-
-        <property name="name" type="java.lang.String"
-                  not-null="true" length="255" unique="true" />
-        <property name="description" type="java.lang.String"
-                  not-null="true" length="255" />
-        <property name="dateCreated" type="java.util.Date"
-                  column="date_created" not-null="true" length="19" />
-        <many-to-one name="creator" class="org.openmrs.User"
-                     not-null="true" />
-        <property name="uuid" type="java.lang.String"
-                  column="uuid" length="38" unique="true" />
-        <many-to-one name="retiredBy" class="org.openmrs.User"
-                     column="retired_by" />
-        <property name="dateRetired" type="java.util.Date"
-                  column="date_retired" length="19" />
-        <property name="retireReason" type="java.lang.String"
-                  column="retire_reason" length="255" />
-        <property name="retired" type="boolean"
-                  length="1" not-null="true" />
-
-        <many-to-one name="changedBy" class="org.openmrs.User" column="changed_by" />
-
-        <property name="dateChanged" type="java.util.Date" column="date_changed" length="19" />
-
-    </class>
-</hibernate-mapping>
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index 6d553c03825..ad487966879 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -2740,6 +2740,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(CareSetting.class)
 			.getMetadataBuilder().build();