diff --git a/api/src/main/java/org/openmrs/Cohort.java b/api/src/main/java/org/openmrs/Cohort.java
index 881a128cc322..e6996269bfbc 100644
--- a/api/src/main/java/org/openmrs/Cohort.java
+++ b/api/src/main/java/org/openmrs/Cohort.java
@@ -10,8 +10,18 @@
 package org.openmrs;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -22,17 +32,30 @@
 /**
  * This class represents a list of patientIds.
  */
+@Entity
+@Table(name = "cohort")
 @Audited
 public class Cohort extends BaseChangeableOpenmrsData {
 	
 	public static final long serialVersionUID = 0L;
 	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY, generator = "cohort_id_seq")
+	@GenericGenerator(
+		name = "cohort_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "cohort_cohort_id_seq")
+	)
+	@Column(name = "cohort_id", nullable = false)
 	private Integer cohortId;
 	
+	@Column(name = "name", nullable = false)
 	private String name;
 	
+	@Column(name = "description", nullable = false)
 	private String description;
 	
+	@OneToMany(mappedBy = "cohort", cascade = CascadeType.ALL, orphanRemoval = true)
 	private Collection<CohortMembership> memberships;
 	
 	public Cohort() {
@@ -349,7 +372,7 @@ public void setMemberIds(Set<Integer> memberIds) {
 	}
 	
 	public void setMemberships(Collection<CohortMembership> members) {
-		this.memberships = members;
+		this.memberships = members; 
 	}
 	
 	/**
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 2bd3c6ad8dc1..642ca2054e0d 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -82,7 +82,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Program.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/Cohort.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/CohortMembership.hbm.xml"/>
 		<mapping resource="org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml" />
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml
deleted file mode 100644
index 56f0a9c2cd2a..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml
+++ /dev/null
@@ -1,55 +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.1//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.openmrs">
-
-	<class name="Cohort" table="cohort">
-		<id name="cohortId" type="int" column="cohort_id">
-			<generator class="native">
-				<param name="sequence">cohort_cohort_id_seq</param>
-			</generator>
-		</id>
-		
-		<property name="name" type="java.lang.String" 
-			not-null="true" length="255" />
-		<property name="description" type="java.lang.String" 
-			not-null="true" length="1000" />
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
-
-		<set name="memberships" cascade="all-delete-orphan,evict" lazy="true" inverse="true">
-			<key column="cohort_id" not-null="true"/>
-			<one-to-many class="org.openmrs.CohortMembership"/>
-		</set>
-
-		<property name="dateCreated" type="java.util.Date"
-			column="date_created" not-null="true" length="19" />
-		<property name="voided" type="java.lang.Boolean"
-			length="1" not-null="true" />
-		<property name="dateVoided" type="java.util.Date"
-			column="date_voided" length="19" />
-		<property name="voidReason" type="java.lang.String"
-			column="void_reason" length="255" />
-		<property name="dateChanged" type="java.util.Date"
-			column="date_changed" length="19" />
-
-		<many-to-one name="creator" class="User" not-null="true" />
-		<many-to-one name="voidedBy" class="User" column="voided_by" />
-		<many-to-one name="changedBy" class="User" column="changed_by" />
-	</class>
-
-</hibernate-mapping>
-	
\ No newline at end of file
diff --git a/api/src/test/java/org/openmrs/CohortTest.java b/api/src/test/java/org/openmrs/CohortTest.java
index 5a89d6fb5fc6..9d74457d87fa 100644
--- a/api/src/test/java/org/openmrs/CohortTest.java
+++ b/api/src/test/java/org/openmrs/CohortTest.java
@@ -65,7 +65,7 @@ public void constructorWithCommaSeparatedIntegers_shouldAddMembersToCohort() {
 	@Test
 	public void getCommaSeparatedPatientIds_shouldReturnCommaSeparatedListOfPatients() {
 		
-		List<Patient> patients = new ArrayList<>();
+		Set<Patient> patients = new HashSet<>();
 		Arrays.stream(ids).forEach(id -> patients.add(new Patient(id)));
 		
 		Cohort cohort = new Cohort("name", "description", patients);
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index 6d553c038256..d34d94c7e42d 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -21,6 +21,7 @@
 
 import org.openmrs.Allergy;
 import org.openmrs.CareSetting;
+import org.openmrs.Cohort;
 import org.openmrs.Concept;
 import org.openmrs.ConceptClass;
 import org.openmrs.ConceptDatatype;
@@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(Cohort.class)
 			.getMetadataBuilder().build();