diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php
index f0022a9..58d61b9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php
@@ -39,7 +39,14 @@ public function testNodePublishedTimestampUpgrade() {
     $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
     $nodes = node_load_multiple(NULL);
     foreach ($nodes as $node) {
-      $timestamp = db_query('SELECT timestamp FROM {node_revision} WHERE nid = :nid AND status = 1 GROUP BY nid', array(':nid' => $node->nid))->fetchField();
+      $revisions = db_query('SELECT COUNT(*) FROM {node_revision} WHERE nid = :nid', array(':nid' => $nid,))->fetchField();
+      $timestamp = '';
+      if ($revisions > 1) {
+        $timestamp = db_query('SELECT timestamp FROM {node_revision} WHERE nid = :nid AND status = 1 GROUP BY nid', array(':nid' => $node->nid))->fetchField();
+      }
+      else {
+        $timestamp = db_query('SELECT created FROM {node} WHERE nid = :nid AND status = 1', array(':nid' => $node->nid))->fetchField();
+      }
       if (!empty($timestamp)) {
         $this->assertEqual($timestamp, $node->published, 'Published content has published timestamp.');
       }