diff --git a/src/Entity/Workspace.php b/src/Entity/Workspace.php
index a041720..c25c55a 100644
--- a/src/Entity/Workspace.php
+++ b/src/Entity/Workspace.php
@@ -17,7 +17,8 @@ use Drupal\user\UserInterface;
  *   label = @Translation("Workspace"),
  *   bundle_label = @Translation("Workspace type"),
  *   handlers = {
- *     "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage"
+ *     "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage",
+ *     "views_data" = "Drupal\views\EntityViewsData"
  *   },
  *   admin_permission = "administer workspaces",
  *   base_table = "workspace",
diff --git a/tests/src/Functional/ViewsUiTest.php b/tests/src/Functional/ViewsUiTest.php
new file mode 100644
index 0000000..c88c896
--- /dev/null
+++ b/tests/src/Functional/ViewsUiTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\Tests\multiversion\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * @group multiversion
+ */
+class ViewsUiTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'entity_storage_migrate',
+    'key_value',
+    'multiversion',
+    'serialization',
+    'views',
+    'views_ui',
+  ];
+
+  /**
+   * Tests that workspace entity fields are available in Views UI.
+   */
+  public function testWorkspaceFieldsAvailable() {
+    $account = User::load(1);
+    $account->setPassword('admin')->save();
+    $account->passRaw = 'admin';
+    $this->drupalLogin($account);
+
+    $this->drupalGet('/admin/structure/views/add');
+    // Assert that workspaces are available as a base table option. Since
+    // workspaces use the generic Views data handler, this pretty much ensures
+    // that all fields of the workspace entity type are available to the view.
+    $this->assertSession()->optionExists('show[wizard_key]', 'standard:workspace');
+  }
+
+}