diff --git a/paragraphs.install b/paragraphs.install
index 5592400..9f48238 100644
--- a/paragraphs.install
+++ b/paragraphs.install
@@ -242,3 +242,32 @@ function paragraphs_update_8014() {
   $entity_definition_update_manager = \Drupal::service('entity.definition_update_manager');
   $entity_definition_update_manager->updateFieldStorageDefinition($entity_definition_update_manager->getFieldStorageDefinition('status', 'paragraph'));
 }
+
+/**
+ * Remove the uid and revision_uid fields.
+ */
+function paragraphs_update_8015() {
+  $tables_fields = [
+    'paragraphs_item_revision' => 'revision_uid',
+    'paragraphs_item_field_data' => 'uid',
+    'paragraphs_item_revision_field_data' => 'uid',
+  ];
+
+  $database = \Drupal::database();
+  $entity_definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+
+  foreach ($tables_fields as $table => $field) {
+    if ($database->schema()->fieldExists($table, $field)) {
+      $database->update($table)
+        ->fields([$field => NULL])
+        ->execute();
+    }
+  }
+
+  foreach ($tables_fields as $table => $field) {
+    $storage_definition = $entity_definition_update_manager->getFieldStorageDefinition($field, 'paragraph');
+    if ($storage_definition) {
+      $entity_definition_update_manager->uninstallFieldStorageDefinition($storage_definition);
+    }
+  }
+}
diff --git a/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php b/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php
index 7a6f4dd..f0dc47f 100644
--- a/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php
+++ b/src/Tests/Experimental/ParagraphsExperimentalBehaviorsTest.php
@@ -191,17 +191,6 @@ class ParagraphsExperimentalBehaviorsTest extends ParagraphsExperimentalTestBase
 
     $this->assertResponse(200);
 
-    $field_definition = \Drupal::service('entity_field.manager')->getFieldDefinitions('paragraph', $paragraph_type)['uid'];
-    $field_definition->getConfig($paragraph_type)->save();
-
-    // Enable the test field selection plugin.
-    $edit = [
-      'behavior_plugins[test_field_selection][enabled]' => TRUE,
-    ];
-    $this->drupalPostForm('admin/structure/paragraphs_type/' . $paragraph_type, $edit, t('Save'));
-    // Assert that the uid field is not shown as an option for the select.
-    $this->drupalGet('admin/structure/paragraphs_type/' . $paragraph_type);
-    $this->assertNoOption('edit-behavior-plugins-test-field-selection-settings-field-selection', 'uid');
     // Add a paragraphed content.
     $this->drupalPostAjaxForm('node/add/paragraphed_test', [], 'field_paragraphs_text_paragraph_test_add_more');
     $edit = [