diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
index 790ecb5..1bf1062 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml
@@ -20,9 +20,16 @@ process:
   promote: promote
   sticky: sticky
   'body/format':
-    plugin: migration
-    migration: d6_filter_format
-    source: format
+    -
+      plugin: static_map
+      bypass: true
+      source: format
+      map:
+        0: NULL
+    -
+      plugin: migration
+      migration: d6_filter_format
+      no_stub: 1
   'body/value': body
   'body/summary': teaser
   revision_uid: uid
diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php
index cc5374b..f20c4b3 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php
@@ -311,7 +311,7 @@ public function load() {
         'teaser' => 'test page teaser rev 4',
         'log' => '',
         'timestamp' => 1390095701,
-        'format' => 1,
+        'format' => 0,
       ))
       ->execute();
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
index 8b57fe0..4280bb5 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\Core\Database\Database;
+use Drupal\node\Entity\Node;
 
 /**
  * Node content migration.
@@ -36,7 +37,7 @@ protected function setUp() {
    * Test node migration from Drupal 6 to 8.
    */
   public function testNode() {
-    $node = node_load(1);
+    $node = Node::load(1);
     $this->assertEqual($node->id(), 1, 'Node 1 loaded.');
     $this->assertEqual($node->langcode->value, 'und');
     $this->assertEqual($node->body->value, 'test');
@@ -79,12 +80,15 @@ public function testNode() {
     $executable = new MigrateExecutable($migration, $this);
     $executable->import();
 
-    $node = node_load(1);
+    $node = Node::load(1);
     $this->assertEqual($node->getTitle(), 'New node title');
     // Test a multi-column fields are correctly upgraded.
     $this->assertEqual($node->body->value, 'test');
     $this->assertEqual($node->body->format, 'full_html');
 
+    $node = Node::load(3);
+    // Test that format = 0 from source maps to NULL.
+    $this->assertIdentical($node->body->format, NULL);
   }
 
 }