diff --git a/app/Models/MetricPoint.php b/app/Models/MetricPoint.php
index 0bbdd80d..9e5cdc49 100644
--- a/app/Models/MetricPoint.php
+++ b/app/Models/MetricPoint.php
@@ -14,9 +14,17 @@ namespace CachetHQ\Cachet\Models;
 use AltThree\Validator\ValidatingTrait;
 use CachetHQ\Cachet\Presenters\MetricPointPresenter;
 use Carbon\Carbon;
+use DateTime;
 use Illuminate\Database\Eloquent\Model;
 use McCool\LaravelAutoPresenter\HasPresenter;
 
+/**
+ * This is the metric point model class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Joseph Cohen <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class MetricPoint extends Model implements HasPresenter
 {
     use ValidatingTrait;
@@ -102,7 +110,9 @@ class MetricPoint extends Model implements HasPresenter
             return;
         }
 
-        $createdAt = Carbon::parse($createdAt);
+        if (!$createdAt instanceof DateTime) {
+            $createdAt = Carbon::parse($createdAt);
+        }
 
         $timestamp = $createdAt->format('U');
         $timestamp = 30 * round($timestamp / 30);
diff --git a/tests/Api/MetricPointTest.php b/tests/Api/MetricPointTest.php
index 9b475632..a953992c 100644
--- a/tests/Api/MetricPointTest.php
+++ b/tests/Api/MetricPointTest.php
@@ -69,7 +69,7 @@ class MetricPointTest extends AbstractApiTestCase
         $this->beUser();
 
         $metric = factory(Metric::class)->create();
-        $timestamp = 1434369116;
+        $timestamp = strtotime('now');
         $metricPoint = factory(MetricPoint::class)->make([
             'metric_id' => $metric->id,
         ]);
@@ -81,7 +81,7 @@ class MetricPointTest extends AbstractApiTestCase
         $response->assertStatus(200);
         $response->assertJsonFragment([
             'value'      => $metricPoint->value,
-            'created_at' => date('Y-m-d H:i:00', 1434369116),
+            'created_at' => date('Y-m-d H:i:s', $timestamp),
         ]);
     }