diff --git a/contact_storage.install b/contact_storage.install
index 361f5d3..3ea2cad 100644
--- a/contact_storage.install
+++ b/contact_storage.install
@@ -15,6 +15,9 @@ use Drupal\Core\Field\BaseFieldDefinition;
  * Implements hook_install().
  */
 function contact_storage_install() {
+  // Set the weight of the contact_storage.module to 1 so it is loaded after the
+  // contact_storage_test.module.
+  module_set_weight('contact_storage', 1);
   $entity_definition_update_manager = \Drupal::entityDefinitionUpdateManager();
   $original_contact_message = $entity_definition_update_manager->getEntityType('contact_message');
   $original_contact_form = \Drupal::entityTypeManager()->getDefinition('contact_form');
diff --git a/tests/src/Functional/ContactStorageTest.php b/tests/src/Functional/ContactStorageTest.php
index f4cc335..9a5ffda 100644
--- a/tests/src/Functional/ContactStorageTest.php
+++ b/tests/src/Functional/ContactStorageTest.php
@@ -38,6 +38,7 @@ class ContactStorageTest extends ContactStorageTestBase {
     'contact',
     'language',
     'field_ui',
+    'contact_storage_test',
     'contact_test',
     'contact_storage',
     'filter',