diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java
index dc439ff..2948ae9 100644
--- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java
+++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java
@@ -238,7 +238,7 @@ public class AlarmThresholdingBolt extends BaseRichBolt {
   }
 
   protected long getTimestamp() {
-    return System.currentTimeMillis() / 1000;
+    return System.currentTimeMillis();
   }
 
   void handleAlarmDeleted(String alarmId) {
diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java
index 0555759..1ad31a2 100644
--- a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java
+++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java
@@ -125,7 +125,7 @@ public class AlarmThresholdingBoltTest {
             + "\"stateChangeReason\":\"Thresholds were exceeded for the sub-alarms: "
             + subAlarm.getExpression().getExpression() + " with the values: []\"," + "\"severity\":\"LOW\","
             + "\"subAlarms\":[" + buildSubAlarmJson(alarm.getSubAlarms()) + "],"
-            + "\"timestamp\":1395587091}}";
+            + "\"timestamp\":1395587091003}}";
 
     verify(alarmEventForwarder, times(1)).send(alarmJson);
     verify(alarmDAO, times(1)).updateState(alarmId, AlarmState.ALARM);
@@ -150,7 +150,7 @@ public class AlarmThresholdingBoltTest {
             + subAlarms.get(2).getExpression().getExpression() + " with the values: []"
             + "\",\"severity\":\"LOW\","
             + "\"subAlarms\":[" + buildSubAlarmJson(alarm.getSubAlarms()) + "],"
-            + "\"timestamp\":1395587091}}";
+            + "\"timestamp\":1395587091003}}";
     verify(alarmEventForwarder, times(1)).send(okJson);
     verify(alarmDAO, times(1)).updateState(alarmId, AlarmState.OK);
   }
@@ -327,7 +327,7 @@ public class AlarmThresholdingBoltTest {
     @Override
     protected long getTimestamp() {
       // Have to keep the time stamp constant so JSON comparison works
-      return 1395587091;
+      return 1395587091003l;
     }
   }
 }