diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
index dcd2e54..19ef644 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
@@ -28,7 +28,7 @@ class EntityReferenceAdminTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'field_ui', 'entity_reference', 'path', 'taxonomy', 'block');
+  public static $modules = array('node', 'field_ui', 'entity_reference', 'path', 'taxonomy', 'block', 'views');
 
 
   /**
@@ -142,6 +142,14 @@ public function testFieldAdminHandler() {
     $this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings'));
     $this->drupalGet($bundle_path . '/fields/' . $field_name);
     $this->assertFieldByName('field[settings][handler_settings][filter][type]', '_none');
+
+    // Try to select the views handler.
+    $edit = array(
+      'field[settings][handler]' => 'views',
+    );
+    $this->drupalPostAjaxForm($bundle_path . '/fields/' . $field_name, $edit, 'field[settings][handler]');
+    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->assertResponse(200);
   }
 
 
diff --git a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
index 4c0d889..cef4fef 100644
--- a/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
+++ b/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
@@ -120,12 +120,18 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       );
     }
     else {
-      $form['view']['no_view_help'] = array(
-        '#markup' => '<p>' . $this->t('No eligible views were found. <a href="@create">Create a view</a> with an <em>Entity Reference</em> display, or add such a display to an <a href="@existing">existing view</a>.', array(
-          '@create' => Url::fromRoute('views_ui.add'),
-          '@existing' => Url::fromRoute('entity.view.collection'),
-        )) . '</p>',
-      );
+      $account = \Drupal::currentUser();
+      if ($account->hasPermission('administer views') && \Drupal::moduleHandler()->moduleExists('views_ui')) {
+        $form['view']['no_view_help'] = array(
+          '#markup' => '<p>' . $this->t('No eligible views were found. <a href="@create">Create a view</a> with an <em>Entity Reference</em> display, or add such a display to an <a href="@existing">existing view</a>.', array(
+            '@create' => Url::fromRoute('views_ui.add'),
+            '@existing' => Url::fromRoute('entity.view.collection'),
+          )) . '</p>',
+        );
+      }
+      else {
+        $form['view']['no_view_help']['#markup'] = '<p>' . $this->t('No eligible views were found.') . '</p>';
+      }
     }
     return $form;
   }
@@ -243,13 +249,13 @@ public function entityQueryAlter(SelectInterface $query) {}
   /**
    * Element validate; Check View is valid.
    */
-  public function settingsFormValidate($element, FormStateInterface $form_state, $form) {
+  public static function settingsFormValidate($element, FormStateInterface $form_state, $form) {
     // Split view name and display name from the 'view_and_display' value.
     if (!empty($element['view_and_display']['#value'])) {
       list($view, $display) = explode(':', $element['view_and_display']['#value']);
     }
     else {
-      $form_state->setError($element, $this->t('The views entity selection mode requires a view.'));
+      $form_state->setError($element, t('The views entity selection mode requires a view.'));
       return;
     }