diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index cfaed358a..ca892e2c5 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -103,6 +103,10 @@
                         <p>Move help/version integration tests to <id>mock/all</id>.  Help and version are covered by unit tests, so we really just to need to make sure there is output when called from the command line.</p>
                     </release-item>
 
+                    <release-item>
+                        <p>Move <id>archive-stop</id> and <id>expire</id> tests to the <id>mock</id> module.  These are mock integration tests so they should be grouped with the other mock integration tests.</p>
+                    </release-item>
+
                     <release-item>
                         <p>Include VM type in <id>gcov</id> path to avoid conflicts between VMs with different architectures.</p>
                     </release-item>
diff --git a/test/define.yaml b/test/define.yaml
index 68165312b..8fdbf2478 100644
--- a/test/define.yaml
+++ b/test/define.yaml
@@ -547,13 +547,6 @@ module:
         coverage:
           command/archive/push/push: full
 
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: stop
-        total: 7
-        container: false
-        individual: true
-        expect: true
-
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: info-unit
         total: 4
@@ -588,39 +581,26 @@ module:
         coverage:
           Backup/Info: partial
 
-  # ********************************************************************************************************************************
-  - name: expire
-    individual: true
-    expect: true
-
-    coverage:
-      Expire: partial
-
-    test:
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: expire
-        total: 4
-
   # ********************************************************************************************************************************
   - name: manifest
+    container: true
 
     test:
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: all
         total: 9
-        container: true
 
         coverage:
           Manifest: partial
 
   # ********************************************************************************************************************************
   - name: stanza
+    container: true
 
     test:
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: all
         total: 9
-        container: true
 
         coverage:
           Stanza: full
@@ -631,28 +611,36 @@ module:
     expect: true
 
     test:
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: stanza
+        total: 3
+
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: expire
+        total: 4
+
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: archive
         total: 3
 
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: archive-stop
+        total: 7
+
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: all
         total: 3
 
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: stanza
-        total: 3
-
   # ********************************************************************************************************************************
   - name: real
+    individual: true
     expect: true
+    db: true
 
     test:
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: all
         total: 6
-        individual: true
-        db: true
 
   # ********************************************************************************************************************************
   - name: performance
diff --git a/test/expect/archive-stop-001.log b/test/expect/mock-archive-stop-001.log
similarity index 100%
rename from test/expect/archive-stop-001.log
rename to test/expect/mock-archive-stop-001.log
diff --git a/test/expect/archive-stop-002.log b/test/expect/mock-archive-stop-002.log
similarity index 100%
rename from test/expect/archive-stop-002.log
rename to test/expect/mock-archive-stop-002.log
diff --git a/test/expect/archive-stop-003.log b/test/expect/mock-archive-stop-003.log
similarity index 100%
rename from test/expect/archive-stop-003.log
rename to test/expect/mock-archive-stop-003.log
diff --git a/test/expect/archive-stop-004.log b/test/expect/mock-archive-stop-004.log
similarity index 100%
rename from test/expect/archive-stop-004.log
rename to test/expect/mock-archive-stop-004.log
diff --git a/test/expect/archive-stop-005.log b/test/expect/mock-archive-stop-005.log
similarity index 100%
rename from test/expect/archive-stop-005.log
rename to test/expect/mock-archive-stop-005.log
diff --git a/test/expect/archive-stop-006.log b/test/expect/mock-archive-stop-006.log
similarity index 100%
rename from test/expect/archive-stop-006.log
rename to test/expect/mock-archive-stop-006.log
diff --git a/test/expect/archive-stop-007.log b/test/expect/mock-archive-stop-007.log
similarity index 100%
rename from test/expect/archive-stop-007.log
rename to test/expect/mock-archive-stop-007.log
diff --git a/test/expect/expire-expire-001.log b/test/expect/mock-expire-001.log
similarity index 100%
rename from test/expect/expire-expire-001.log
rename to test/expect/mock-expire-001.log
diff --git a/test/expect/expire-expire-002.log b/test/expect/mock-expire-002.log
similarity index 100%
rename from test/expect/expire-expire-002.log
rename to test/expect/mock-expire-002.log
diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockArchiveStopTest.pm
similarity index 97%
rename from test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm
rename to test/lib/pgBackRestTest/Module/Mock/MockArchiveStopTest.pm
index fa61fc805..906274cf4 100644
--- a/test/lib/pgBackRestTest/Module/Archive/ArchiveStopTest.pm
+++ b/test/lib/pgBackRestTest/Module/Mock/MockArchiveStopTest.pm
@@ -1,7 +1,7 @@
 ####################################################################################################################################
-# ArchiveStopTest.pm - Tests for archive-push command to make sure aync queue limits are implemented correctly
+# Tests for archive-push command to make sure aync queue limits are implemented correctly
 ####################################################################################################################################
-package pgBackRestTest::Module::Archive::ArchiveStopTest;
+package pgBackRestTest::Module::Mock::MockArchiveStopTest;
 use parent 'pgBackRestTest::Env::HostEnvTest';
 
 ####################################################################################################################################
diff --git a/test/lib/pgBackRestTest/Module/Expire/ExpireExpireTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
similarity index 99%
rename from test/lib/pgBackRestTest/Module/Expire/ExpireExpireTest.pm
rename to test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
index f943e4859..4fe5138d3 100644
--- a/test/lib/pgBackRestTest/Module/Expire/ExpireExpireTest.pm
+++ b/test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
@@ -1,7 +1,7 @@
 ####################################################################################################################################
-# ExpireExpireTest.pm - Tests for expire command
+# Tests for expire command
 ####################################################################################################################################
-package pgBackRestTest::Module::Expire::ExpireExpireTest;
+package pgBackRestTest::Module::Mock::MockExpireTest;
 use parent 'pgBackRestTest::Env::HostEnvTest';
 
 ####################################################################################################################################