diff --git a/app/Entities/Projects/Comment.php b/app/Entities/Projects/Comment.php
index 0ef6df2..f73f6e4 100644
--- a/app/Entities/Projects/Comment.php
+++ b/app/Entities/Projects/Comment.php
@@ -13,4 +13,13 @@ class Comment extends Model
     {
         return $this->belongsTo(User::class);
     }
+
+    public function getTimeDisplayAttribute()
+    {
+        if (now()->format('Y-m-d') != $this->created_at->format('Y-m-d')) {
+            return $this->created_at;
+        }
+
+        return $this->created_at->diffForHumans();
+    }
 }
diff --git a/resources/views/projects/partials/comment-section.blade.php b/resources/views/projects/partials/comment-section.blade.php
index 35e7023..6e70f51 100644
--- a/resources/views/projects/partials/comment-section.blade.php
+++ b/resources/views/projects/partials/comment-section.blade.php
@@ -11,7 +11,7 @@
 @foreach($comments as $comment)
 <div class="alert alert-warning">
     <legend style="font-size: 14px;margin-bottom: 10px;">
-        <span class="label label-default pull-right">{{ $comment->created_at }}</span>
+        <span class="label label-default pull-right">{{ $comment->time_display }}</span>
         <strong>{{ $comment->creator->name }}</strong>
     </legend>
     <div class="pull-right">
diff --git a/tests/Unit/Models/CommentTest.php b/tests/Unit/Models/CommentTest.php
new file mode 100644
index 0000000..5673997
--- /dev/null
+++ b/tests/Unit/Models/CommentTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Unit\Models;
+
+use Tests\TestCase;
+use App\Entities\Users\User;
+use App\Entities\Projects\Comment;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+
+class CommentTest extends TestCase
+{
+    use DatabaseMigrations;
+
+    /** @test */
+    public function a_comment_has_belongs_to_creator_relation()
+    {
+        $comment = factory(Comment::class)->make();
+
+        $this->assertInstanceOf(User::class, $comment->creator);
+        $this->assertEquals($comment->creator_id, $comment->creator->id);
+    }
+
+    /** @test */
+    public function a_comment_has_time_display_attribute()
+    {
+        $comment = factory(Comment::class)->create(['created_at' => now()->subHour()]);
+        $this->assertEquals($comment->created_at->diffForHumans(), $comment->time_display);
+
+        $comment = factory(Comment::class)->create(['created_at' => now()->subDays(3)]);
+        $this->assertEquals($comment->created_at, $comment->time_display);
+    }
+}