diff --git a/tests/src/Kernel/FieldEncryptStorageTest.php b/tests/src/Kernel/FieldEncryptStorageTest.php
index 6352742..88eb6c2 100644
--- a/tests/src/Kernel/FieldEncryptStorageTest.php
+++ b/tests/src/Kernel/FieldEncryptStorageTest.php
@@ -255,6 +255,48 @@ class FieldEncryptStorageTest extends KernelTestBase {
     $this->assertEquals('test value', $entity->field_test_single->value);
   }
 
+  public function testTranslationAndRevisions() {
+    $storage = \Drupal::entityTypeManager()->getStorage('entity_test_mulrev');
+
+    $this->setupTranslationSettings();
+    $entity = EntityTestMulRev::create([
+      'type' => 'entity_test_mulrev',
+      'field_test_single' => 'test value',
+      'langcode' => 'en',
+    ]);
+    $entity->save();
+    $this->assertRawEncrypedFieldDataEntry($entity->id(), 1);
+    $this->assertRawEncryptedValues($entity->id(), 'field_test_single', 1);
+    $entity = $storage->load($entity->id());
+
+    $translation = $entity->addTranslation('fr');
+    $translation->field_test_single->value = 'test value FR';
+    $translation->save();
+    $this->assertRawEncrypedFieldDataEntry($entity->id(), 2);
+    $this->assertRawEncryptedValues($entity->id(), 'field_test_single', 2);
+    $this->assertRawEncryptedRevisionValues($entity->id(), 'field_test_single', 2);
+
+    $revision = clone $entity;
+    $revision->setNewRevision(TRUE);
+    $revision->isDefaultRevision(FALSE);
+    $revision->field_test_single->value = 'test value r1';
+    $revision->save();
+    $this->assertRawEncrypedFieldDataEntry($entity->id(), 4);
+    $this->assertRawEncryptedValues($entity->id(), 'field_test_single', 2);
+    $this->assertRawEncryptedRevisionValues($entity->id(), 'field_test_single', 4);
+
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $storage->resetCache([$entity->id()]);
+    $entity = $storage->load($entity->id());
+    $translation = $entity->getTranslation('fr');
+    $revision = $storage->loadRevision($revision->getRevisionId());
+
+    $this->assertRawEncryptedValues($entity->id(), 'field_test_single', 2);
+    $this->assertEquals('test value FR', $translation->field_test_single->value);
+    $this->assertEquals('test value r1', $revision->field_test_single->value);
+    $this->assertEquals('test value', $entity->field_test_single->value);
+  }
+
   /**
    * Set up translation settings for content translation test.
    */