diff --git a/omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/RestTestConstants2_5.java b/omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/RestTestConstants2_5.java
index 800679442..bcab19d4a 100644
--- a/omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/RestTestConstants2_5.java
+++ b/omod-2.5/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/RestTestConstants2_5.java
@@ -17,6 +17,6 @@ public class RestTestConstants2_5 {
 	
 	public final static String ORDER_ATTRIBUTE_UUID = "3a2bdb18-6faa-11e0-8414-001e378eb67e";
 	
-	public final static String ORDER_ATTRIBUTE_TYPE_UUID = "9516cc50-6f9f-11e0-8414-001e378eb67e";
+	public final static String ORDER_ATTRIBUTE_TYPE_UUID = "c0de4f5c-6626-418e-9f4f-5396a31e68fb";
 	
 }
diff --git a/omod-2.5/src/test/resources/customTestDataset2_5.xml b/omod-2.5/src/test/resources/customTestDataset2_5.xml
index 5a4b7ee4a..a71316e0a 100644
--- a/omod-2.5/src/test/resources/customTestDataset2_5.xml
+++ b/omod-2.5/src/test/resources/customTestDataset2_5.xml
@@ -13,8 +13,7 @@
     <concept_reference_term  concept_reference_term_id="70"  concept_source_id="100"  name="Day"  code="258703001"  creator="1"  date_created="2020-02-20 10:36:02"  retired="0"    uuid="f05afff4-26f9-4fe6-9eaa-ed4a506da5bb"/>
     <concept_reference_map  concept_map_id="70"  concept_reference_term_id="70"  concept_map_type_id="2"  creator="1"  date_created="2020-02-20 10:36:02"  concept_id="28"  uuid="371ad2c8-290e-421a-93d9-1282cdfd0901"/>
 
-    <order_attribute_type order_attribute_type_id="1" name="Dispensing Date" datatype="org.openmrs.customdatatype.datatype.DateDatatype" uuid="9516cc50-6f9f-11e0-8414-001e378eb67e" creator="1" date_created="2005-01-01 00:00:00.0" min_occurs="0" max_occurs="1" retired="false" />
-    <order_attribute_type order_attribute_type_id="2" name="Dispensing Unit" datatype="org.openmrs.customdatatype.datatype.DateDatatype" uuid="9516cc50-6f9f-11e0-8414-001e378eb67f" creator="1" date_created="2005-01-01 00:00:00.0" min_occurs="0" max_occurs="1" retired="true" retired_by="1" date_retired="2005-01-01 02:00:00.0" retire_reason="for fun and profit" />
+    <order_attribute_type order_attribute_type_id="1" name="Dispensing Date" datatype="org.openmrs.customdatatype.datatype.DateDatatype" uuid="c0de4f5c-6626-418e-9f4f-5396a31e68fb" creator="1" date_created="2005-01-01 00:00:00.0" min_occurs="0" max_occurs="1" retired="false" />    <order_attribute_type order_attribute_type_id="2" name="Dispensing Unit" datatype="org.openmrs.customdatatype.datatype.DateDatatype" uuid="9516cc50-6f9f-11e0-8414-001e378eb67f" creator="1" date_created="2005-01-01 00:00:00.0" min_occurs="0" max_occurs="1" retired="true" retired_by="1" date_retired="2005-01-01 02:00:00.0" retire_reason="for fun and profit" />
     <order_attribute_type order_attribute_type_id="3" name="Dispensing Personnel" datatype="org.openmrs.customdatatype.datatype.DateDatatype" uuid="9516cc50-6f9f-132r-5433-001e378eb67f" creator="1" date_created="2005-01-01 00:00:00.0" min_occurs="0" max_occurs="1" retired="false"/>
     <order_attribute_type order_attribute_type_id="4" name="Dispensing Organization" datatype="org.openmrs.customdatatype.datatype.FreeTextDatatype" uuid="9516cc50-6f9f-132r-6556-001e378eb67f" creator="1" date_created="2005-01-01 00:00:00.0" min_occurs="0" max_occurs="1" retired="false"/>