diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/ActivitiMySQLTypeConverter.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/ActivitiMySQLTypeConverter.java
index 6049b2b886e242ee19153c4634b23d6fbdd49d8a..42b94e2a4e3e82b4ee1fa8c2b964da4975357a26 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/ActivitiMySQLTypeConverter.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/ActivitiMySQLTypeConverter.java
@@ -3,6 +3,7 @@ package org.activiti.engine.impl.db;
 import liquibase.database.structure.type.BlobType;
 import liquibase.database.structure.type.BooleanType;
 import liquibase.database.structure.type.DataType;
+import liquibase.database.structure.type.DateTimeType;
 import liquibase.database.structure.type.IntType;
 import liquibase.database.structure.type.NVarcharType;
 import liquibase.database.structure.type.VarcharType;
@@ -20,6 +21,10 @@ public class ActivitiMySQLTypeConverter extends MySQLTypeConverter {
       final Boolean autoIncrement, final String dataTypeName,
       final String precision, final String additionalInformation) {
 
+    if (columnTypeString.equalsIgnoreCase("timestamp")) {
+      return new DateTimeType("datetime");
+    }
+    
     DataType dataType = super.getDataType(columnTypeString, autoIncrement,
         dataTypeName, precision, additionalInformation);
     if (dataType instanceof NVarcharType) {
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.11.xml b/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.11.xml
index a9f10ec47bce0a4e14aec42340773beafedf4a07..86ebb89463c190c288b6b0ecf3318dfda607f4c4 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.11.xml
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.11.xml
@@ -31,6 +31,9 @@
             <column name="EDITOR_SOURCE_VALUE_ID_" type="NVARCHAR(64)"/>
             <column name="EDITOR_SOURCE_EXTRA_VALUE_ID_" type="NVARCHAR(64)"/>
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
    </changeSet>
 
    <changeSet id="3.1 Activiti 5.11 Add Constraint to ACT_RE_MODEL" author="trademakers">
@@ -127,6 +130,9 @@
             <column name="TEXT_" type="NVARCHAR(4000)"/>            
             <column name="TEXT2_" type="NVARCHAR(4000)"/>            
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
    </changeSet>
    
    <changeSet id="11.1 Activiti 5.11 Create Index on ACT_HI_VARINST" author="trademakers">                                  
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.7.xml b/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.7.xml
index 728d3faabf06be7a3b5f68d7a106736981d8c96b..ba9adef136142b4227f77a0dfe9d126557d700c2 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.7.xml
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.7.xml
@@ -16,6 +16,9 @@
             <column name="VALUE_"               type="NVARCHAR(300)" />
             <column name="REV_"                 type="INTEGER" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="1.2 ACT_GE_PROPERTY" author="trademakers">
@@ -51,6 +54,9 @@
             <column name="DEPLOYMENT_ID_"       type="NVARCHAR(64)" />
             <column name="BYTES_"               type="BLOB" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="3 ACT_RE_DEPLOYMENT" author="trademakers">
@@ -61,6 +67,9 @@
             <column name="NAME_"                type="NVARCHAR(255)" />
             <column name="DEPLOY_TIME_"         type="TIMESTAMP" /> 
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="4 ACT_RU_EXECUTION" author="trademakers">
@@ -84,6 +93,12 @@
             <column name="IS_CONCURRENT_"       type="BOOLEAN" />
             <column name="IS_SCOPE_"            type="BOOLEAN" />
         </createTable>
+        <modifySql dbms="mssql">
+          <replace replace="BOOLEAN" with="tinyint"/>
+        </modifySql>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
     
     <changeSet id="4.1.1 ACT_UNIQ_RU_BUS_KEY DB2" author="trademakers" dbms="db2">
@@ -151,6 +166,12 @@
             <column name="HANDLER_TYPE_"        type="NVARCHAR(255)" />
             <column name="HANDLER_CFG_"         type="NVARCHAR(4000)" />
         </createTable>
+        <modifySql dbms="mssql">
+          <replace replace="BOOLEAN" with="bit"/>
+        </modifySql>
+        <modifySql dbms="mysql">
+          <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
 
     <changeSet id="6 ACT_ID_GROUP" author="trademakers">
@@ -162,6 +183,9 @@
             <column name="NAME_"                type="NVARCHAR(255)" />
             <column name="TYPE_"                type="NVARCHAR(255)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="7 ACT_ID_MEMBERSHIP" author="trademakers">
@@ -173,6 +197,9 @@
                 <constraints nullable="false"/>
             </column>
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="7.1 ACT_ID_MEMBERSHIP" author="trademakers">
@@ -192,6 +219,9 @@
             <column name="PWD_"                 type="NVARCHAR(255)" />
             <column name="PICTURE_ID_"          type="NVARCHAR(64)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="9 ACT_RE_PROCDEF" author="trademakers">
@@ -208,6 +238,9 @@
             <column name="DGRM_RESOURCE_NAME_"  type="NVARCHAR(4000)" />
             <column name="HAS_START_FORM_KEY_"  type="BOOLEAN" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="10 ACT_RU_TASK" author="trademakers">
@@ -230,6 +263,9 @@
             <column name="DUE_DATE_"            type="TIMESTAMP" />
             <column name="PARENT_TASK_ID_"      type="NVARCHAR(64)"/>
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="11 ACT_RU_IDENTITYLINK" author="trademakers">
@@ -243,6 +279,9 @@
             <column name="USER_ID_"             type="NVARCHAR(64)" />
             <column name="TASK_ID_"             type="NVARCHAR(64)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="12 ACT_RU_VARIABLE" author="trademakers">
@@ -266,6 +305,9 @@
             <column name="TEXT_"                type="NVARCHAR(4000)" />
             <column name="TEXT2_"               type="NVARCHAR(4000)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
  
     <changeSet id="13 ACT_HI_PROCINST" author="trademakers">
@@ -295,6 +337,9 @@
             <column name="END_ACT_ID_"          type="NVARCHAR(255)" />
             <column name="SUPER_PROCESS_INSTANCE_ID_" type="NVARCHAR(64)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
 
     <changeSet id="13.1 UK_ACT_HI_PROCINST" author="trademakers">
@@ -379,6 +424,9 @@
             <column name="END_TIME_"            type="TIMESTAMP" />
             <column name="DURATION_"            type="BIGINT" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
     
     <changeSet id="15 ACT_HI_DETAIL" author="trademakers">
@@ -407,6 +455,9 @@
             <column name="TEXT_"                type="NVARCHAR(4000)" />
             <column name="TEXT2_"               type="NVARCHAR(4000)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
     
     <changeSet id="16 Activiti 5.1 Update ACT_HI_TASKINST" author="trademakers">
@@ -432,6 +483,9 @@
             <column name="OWNER_" type="NVARCHAR(64)"/>
             <column name="PARENT_TASK_ID_" type="NVARCHAR(64)"/>
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
     
     <changeSet id="17 Activiti 5.4 Create ACT_HI_COMMENT" author="trademakers">
@@ -450,6 +504,9 @@
             <column name="ACTION_" type="NVARCHAR(255)"/>
             <column name="FULL_MSG_" type="BLOB"/>
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
 
     <changeSet id="18 Activiti 5.4 Create ACT_HI_ATTACHMENT" author="trademakers">
@@ -467,6 +524,9 @@
             <column name="URL_" type="NVARCHAR(4000)" />
             <column name="CONTENT_ID_" type="NVARCHAR(64)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
 
     <changeSet id="19 Activiti 5.4 Create ACT_ID_INFO" author="trademakers">
@@ -482,6 +542,9 @@
             <column name="PASSWORD_" type="BLOB" />
             <column name="PARENT_ID_" type="NVARCHAR(255)" />
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
 
     <!-- Indexes: -->
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.9.xml b/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.9.xml
index 6f1a27188a7393a3c030652b11c849a2a1ed54be..c44984f301d8f601fe865b802b0b34b8d56dd150 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.9.xml
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/liquibase/activiti-5.9.xml
@@ -65,6 +65,9 @@
                 <constraints nullable="false"/>
             </column>
         </createTable>
+        <modifySql dbms="mysql">
+         <append value=" ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin"/>
+        </modifySql>
     </changeSet>
     
     <changeSet id="13.1 ACT_IDX_EVENT_SUBSCR_CONFIG_" author="trademakers" >                                  
diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskQueryTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskQueryTest.java
index a695ce7811dfb10327da9f0da7cacf9a274c27fa..838ba423dc47ee07952f2738dc0fd0047df6f9cd 100644
--- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskQueryTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/task/TaskQueryTest.java
@@ -766,19 +766,20 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     task.setDueDate(dueDate);
     taskService.saveTask(task);
 
-    assertEquals(1, taskService.createTaskQuery().dueDate(dueDate).count());
+    assertEquals(1, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueDate(dueDate).count());
     
     Calendar otherDate = Calendar.getInstance();
     otherDate.add(Calendar.YEAR, 1);
-    assertEquals(0, taskService.createTaskQuery().dueDate(otherDate.getTime()).count());
+    assertEquals(0, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueDate(otherDate.getTime()).count());
 
     Calendar priorDate = Calendar.getInstance();
     priorDate.setTime(dueDate);
     priorDate.roll(Calendar.YEAR, -1);
-    assertEquals(1, taskService.createTaskQuery().dueAfter(priorDate.getTime())
+    
+    assertEquals(1, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueAfter(priorDate.getTime())
         .count());
 
-    assertEquals(1, taskService.createTaskQuery()
+    assertEquals(1, taskService.createTaskQuery().processInstanceId(processInstance.getId())
         .dueBefore(otherDate.getTime()).count());
   }
   
@@ -800,16 +801,16 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     oneHourLater.setTime(dueDateCal.getTime());
     oneHourLater.add(Calendar.HOUR, 1);
 
-    assertEquals(1, taskService.createTaskQuery().dueBefore(oneHourLater.getTime()).count());
-    assertEquals(0, taskService.createTaskQuery().dueBefore(oneHourAgo.getTime()).count());
+    assertEquals(1, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueBefore(oneHourLater.getTime()).count());
+    assertEquals(0, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueBefore(oneHourAgo.getTime()).count());
     
     // Update due-date to null, shouldn't show up anymore in query that matched before
     task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
     task.setDueDate(null);
     taskService.saveTask(task);
     
-    assertEquals(0, taskService.createTaskQuery().dueBefore(oneHourLater.getTime()).count());
-    assertEquals(0, taskService.createTaskQuery().dueBefore(oneHourAgo.getTime()).count());
+    assertEquals(0, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueBefore(oneHourLater.getTime()).count());
+    assertEquals(0, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueBefore(oneHourAgo.getTime()).count());
   }
   
   @Deployment(resources={"org/activiti/engine/test/api/task/TaskQueryTest.testProcessDefinition.bpmn20.xml"})
@@ -830,16 +831,16 @@ public class TaskQueryTest extends PluggableActivitiTestCase {
     oneHourLater.setTime(dueDateCal.getTime());
     oneHourLater.add(Calendar.HOUR, 1);
 
-    assertEquals(1, taskService.createTaskQuery().dueAfter(oneHourAgo.getTime()).count());
-    assertEquals(0, taskService.createTaskQuery().dueAfter(oneHourLater.getTime()).count());
+    assertEquals(1, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueAfter(oneHourAgo.getTime()).count());
+    assertEquals(0, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueAfter(oneHourLater.getTime()).count());
     
     // Update due-date to null, shouldn't show up anymore in query that matched before
     task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
     task.setDueDate(null);
     taskService.saveTask(task);
     
-    assertEquals(0, taskService.createTaskQuery().dueAfter(oneHourLater.getTime()).count());
-    assertEquals(0, taskService.createTaskQuery().dueAfter(oneHourAgo.getTime()).count());
+    assertEquals(0, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueAfter(oneHourLater.getTime()).count());
+    assertEquals(0, taskService.createTaskQuery().processInstanceId(processInstance.getId()).dueAfter(oneHourAgo.getTime()).count());
   }
   
   public void testQueryPaging() {
diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricTaskInstanceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricTaskInstanceTest.java
index a892fe4a9987f884983f084a4f77bfc18fd6ec36..f7f78750a3c8c7292d8c68cbf1d593679853f1ab 100644
--- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricTaskInstanceTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/history/HistoricTaskInstanceTest.java
@@ -51,6 +51,7 @@ public class HistoricTaskInstanceTest extends PluggableActivitiTestCase {
     String taskId = runtimeTask.getId();
     String taskDefinitionKey = runtimeTask.getTaskDefinitionKey();
     
+    assertEquals(1, historyService.createHistoricTaskInstanceQuery().count());
     HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().singleResult();
     assertEquals(taskId, historicTaskInstance.getId());
     assertEquals(1234, historicTaskInstance.getPriority());