diff --git a/CHANGES.txt b/CHANGES.txt
index 04322588245..abdd0dcdcb6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -86,6 +86,7 @@ Release 0.19.0 - Unreleased
    HBASE-1021  hbase metrics FileContext not working
    HBASE-1023  Check global flusher
    HBASE-1036  HBASE-1028 broke Thrift
+   HBASE-1037  Some test cases failing on Windows/Cygwin but not UNIX/Linux
       
   IMPROVEMENTS
    HBASE-901   Add a limit to key length, check key and value length on client side
diff --git a/src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java b/src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java
index 1bec5f1841b..44a0c34f8c4 100644
--- a/src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java
+++ b/src/test/org/apache/hadoop/hbase/thrift/TestThriftServer.java
@@ -189,6 +189,10 @@ public class TestThriftServer extends HBaseClusterTestCase {
     long time1 = System.currentTimeMillis();
     handler.mutateRowTs(tableAname, rowAname, getMutations(), time1);
 
+    // Sleep to assure that 'time1' and 'time2' will be different even with a
+    // coarse grained system timer.
+    Thread.sleep(1000);
+
     // Apply timestamped BatchMutations for rowA and rowB
     long time2 = System.currentTimeMillis();
     handler.mutateRowsTs(tableAname, getBatchMutations(), time2);
@@ -253,6 +257,10 @@ public class TestThriftServer extends HBaseClusterTestCase {
     long time1 = System.currentTimeMillis();
     handler.mutateRowTs(tableAname, rowAname, getMutations(), time1);
 
+    // Sleep to assure that 'time1' and 'time2' will be different even with a
+    // coarse grained system timer.
+    Thread.sleep(1000);
+
     // Apply timestamped BatchMutations for rowA and rowB
     long time2 = System.currentTimeMillis();
     handler.mutateRowsTs(tableAname, getBatchMutations(), time2);