diff --git a/static/directives/build-logs-view.html b/static/directives/build-logs-view.html
index bb6997c97..696fd4b93 100644
--- a/static/directives/build-logs-view.html
+++ b/static/directives/build-logs-view.html
@@ -32,7 +32,7 @@
         <span class="id" bo-text="$index + container.index + 1" ng-if="!useTimestamps"></span>
         <span class="id" bo-text="formatDatetime(entry.datetime)" ng-if="useTimestamps"></span>
         <span class="message" bo-html="processANSI(entry.message, container)"></span>
-        <span class="timestamp" bo-text="formatDatetime(entry.datetime)" ng-if="!useTimestamps"></span>
+        <span class="timestamp" bo-text="formatDatetime(entry.data.datetime)" ng-if="!useTimestamps"></span>
       </div>
     </div>
   </div>
diff --git a/test/testlogs.py b/test/testlogs.py
index cf140f085..b2c3a8e9e 100644
--- a/test/testlogs.py
+++ b/test/testlogs.py
@@ -143,12 +143,12 @@ class TestBuildLogs(RedisBuildLogs):
     if random.randint(0, 10) <= 8:
       premessage = {
         'message': '\x1b[91m' + get_sentence(),
-        'datetime':  str(datetime.datetime.now())
+        {'data': 'datetime':  str(datetime.datetime.now())}
       }
 
       postmessage = {
         'message': '\x1b[0m',
-        'datetime':  str(datetime.datetime.now())
+        {'data': 'datetime':  str(datetime.datetime.now())}
       }
 
       count = count - 2
@@ -157,7 +157,7 @@ class TestBuildLogs(RedisBuildLogs):
     def get_message():
       return {
         'message': get_sentence(),
-        'datetime':  str(datetime.datetime.now())
+        {'data': 'datetime':  str(datetime.datetime.now())}
       }
 
     return others + [(1, get_message(), None) for _ in range(count)]