diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 0f310246c..10ad25f01 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -237,6 +237,14 @@
                     <release-item>
                         <p>Reduce <proper>ScalityS3</proper> processes since only two are needed.</p>
                     </release-item>
+
+                    <release-item>
+                        <release-item-contributor-list>
+                            <release-item-contributor id="cynthia.shang"/>
+                        </release-item-contributor-list>
+
+                        <p>Update <id>mock/expire</id> module test matrix so expect tests output.</p>
+                    </release-item>
                 </release-development-list>
             </release-test-list>
         </release>
diff --git a/test/expect/mock-expire-001.log b/test/expect/mock-expire-001.log
index a643ed9c9..07357e9f2 100644
--- a/test/expect/mock-expire-001.log
+++ b/test/expect/mock-expire-001.log
@@ -1,5 +1,5 @@
-run 001 - local, enc 0
-======================
+run 001 - simple, enc 0, s3 0
+=============================
 
 * full backup: label = [BACKUP-FULL-1], start = 000000010000000000000000, stop = 000000010000000000000002
 * incr backup: label = [BACKUP-INCR-1], prior = [BACKUP-FULL-1], start = 000000010000000000000006, stop = 0000000100000000000000FB
diff --git a/test/expect/mock-expire-002.log b/test/expect/mock-expire-002.log
index 09574dd94..fb755cbc1 100644
--- a/test/expect/mock-expire-002.log
+++ b/test/expect/mock-expire-002.log
@@ -1,5 +1,5 @@
-run 002 - Expire::stanzaUpgrade, enc 0
-======================================
+run 002 - stanzaUpgrade, enc 0, s3 0
+====================================
 
 * full backup: label = [BACKUP-FULL-1], start = 000000010000000000000000, stop = 000000010000000000000002
 * incr backup: label = [BACKUP-INCR-1], prior = [BACKUP-FULL-1], start = 000000010000000000000006, stop = 000000010000000000000008
diff --git a/test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
index 4eb20c368..22843e4ec 100644
--- a/test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
+++ b/test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
@@ -79,10 +79,10 @@ sub run
 
     foreach my $rhRun
     (
-        {vm => VM1, s3 => false, encrypt => false},
-        {vm => VM2, s3 =>  true, encrypt => false},
-        {vm => VM3, s3 =>  true, encrypt =>  true},
-        {vm => VM4, s3 => false, encrypt =>  true},
+        {vm => VM1, s3 =>  true, encrypt => false},
+        {vm => VM2, s3 => false, encrypt =>  true},
+        {vm => VM3, s3 => false, encrypt => false},
+        {vm => VM4, s3 =>  true, encrypt =>  true},
     )
     {
         # Only run tests for this vm
@@ -92,9 +92,13 @@ sub run
         my $bS3 = $rhRun->{s3};
         my $bEncrypt = $rhRun->{encrypt};
 
+        if ($bS3 && ($self->vm() eq VM3))
+        {
+            confess &log("cannot configure s3 for expect log tests");
+        }
+
         ############################################################################################################################
-        # Pass !$bEncrypt so expect logs are not generated for encryption tests
-        if ($self->begin("local, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
+        if ($self->begin("simple, enc ${bEncrypt}, s3 ${bS3}"))
         {
             # Create hosts, file object, and config
             my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(
@@ -193,8 +197,7 @@ sub run
         }
 
         ############################################################################################################################
-        # Pass !$bEncrypt so expect logs are not generated for encryption tests
-        if ($self->begin("Expire::stanzaUpgrade, enc ${bEncrypt}, s3 ${bS3}", !$bEncrypt))
+        if ($self->begin("stanzaUpgrade, enc ${bEncrypt}, s3 ${bS3}"))
         {
             # Create hosts, file object, and config
             my ($oHostDbMaster, $oHostDbStandby, $oHostBackup, $oHostS3) = $self->setup(