diff --git a/diff.module b/diff.module
index 418a279..c36a2bf 100644
--- a/diff.module
+++ b/diff.module
@@ -32,8 +32,8 @@ function diff_form_node_type_edit_form_alter(&$form, FormStateInterface $form_st
 
     $form['diff']['view_mode'] = array(
       '#type' => 'select',
-      '#title' => t('Standard comparison preview'),
-      '#description' => t('Governs the <em>Current revision</em> view mode when doing comparisons.'),
+      '#title' => t('View mode to use to compare revisions'),
+      '#description' => t('This view mode will be used to compare revisions. You can select which fields should be shown at the Manage display tab.'),
       '#options' => $options,
       '#weight' => 13,
       '#default_value' => $config->get('content_type_settings.' . $type->id() . '.view_mode'),
diff --git a/src/Tests/ViewModeTest.php b/src/Tests/ViewModeTest.php
new file mode 100644
index 0000000..624c41b
--- /dev/null
+++ b/src/Tests/ViewModeTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\diff\ViewModeTest.
+ *
+ * @ingroup diff
+ */
+
+namespace Drupal\diff\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests field visibility when using a custom view mode.
+ *
+ * @group diff
+ */
+class ViewModeTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node', 'diff', 'field_ui', 'block');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create the Article content type.
+    $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
+
+    // Place the blocks that Diff module uses.
+    $this->drupalPlaceBlock('local_tasks_block');
+    $this->drupalPlaceBlock('local_actions_block');
+
+    $this->drupalLogin($this->rootUser);
+  }
+
+  /**
+   * Tests field visibility using a cutom view mode.
+   */
+  public function testViewMode() {
+    // Set the Article content type to use the diff view mode.
+    $edit = [
+      'view_mode' => 'diff',
+    ];
+    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    $this->assertText('The content type Article has been updated.');
+
+    // Specialize the 'diff' view mode, check that the field is displayed the same.
+    $edit = array(
+      "display_modes_custom[diff]" => TRUE,
+    );
+    $this->drupalPostForm('admin/structure/types/manage/article/display', $edit, t('Save'));
+
+    // Set the Body field to hidden in the diff view mode.
+    $edit = array(
+      'fields[body][type]' => 'hidden',
+    );
+    $this->drupalPostForm('admin/structure/types/manage/article/display/diff', $edit, t('Save'));
+
+    // Create a node.
+    $node = $this->drupalCreateNode([
+      'type' => 'article',
+      'title' => 'Sample node',
+      'body' => [
+        'value' => 'Foo',
+      ],
+    ]);
+
+    // Edit the article and change the email.
+    $edit = array(
+      'body[0][value]' => 'Fighters',
+      'revision' => TRUE,
+    );
+    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+
+    // Check the difference between the last two revisions.
+    $this->clickLink(t('Revisions'));
+    $this->drupalPostForm(NULL, NULL, t('Compare'));
+    $this->assertNoText('Changes to Body');
+    $this->assertNoText('Foo');
+    $this->assertNoText('Fighters');
+  }
+
+}