diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTestSuite.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTestSuite.kt
index 2b13f7bfc8..6cab906df5 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTestSuite.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ImportExportTestSuite.kt
@@ -66,10 +66,11 @@ class ImportExportTestSuite(private val path: String) {
     val success = importResult as ImportResult.Success
 
     val generatedBackupData = BackupRepository.debugExport(plaintext = true, currentTime = success.backupTime)
-
-    // TODO [backup] Currently fails, need to look into it
-//    assertPassesValidator(generatedBackupData)
     assertEquivalent(binProtoBytes, generatedBackupData)
+
+    // Validator expects encrypted data, so we have to export again with encryption to validate
+    val encryptedBackupData = BackupRepository.debugExport(plaintext = false, currentTime = success.backupTime)
+    assertPassesValidator(encryptedBackupData)
   }
 
   private fun import(importData: ByteArray): ImportResult {