diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 66dfd13dd..f0a415074 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -119,6 +119,10 @@
                         <p>Reduce expect log level in <id>mock/archive</id> tests.</p>
                     </release-item>
 
+                    <release-item>
+                        <p>Rename test modules for consistency.</p>
+                    </release-item>
+
                     <release-item>
                         <p>Disable test-level stack trace by default.</p>
                     </release-item>
diff --git a/test/define.yaml b/test/define.yaml
index 7b3ff0b3a..03966df74 100644
--- a/test/define.yaml
+++ b/test/define.yaml
@@ -612,6 +612,13 @@ unit:
         coverage:
           info/infoArchive: full
 
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: info-archive-perl
+        total: 4
+
+        coverage:
+          Archive/Info: partial
+
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: info-backup
         total: 2
@@ -619,10 +626,80 @@ unit:
         coverage:
           info/infoBackup: full
 
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: info-backup-perl
+        total: 3
+
+        coverage:
+          Backup/Info: partial
+
   # ********************************************************************************************************************************
   - name: command
 
     test:
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: archive-common
+        total: 6
+
+        coverage:
+          command/archive/common: full
+
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: archive-common-perl
+        total: 6
+
+        coverage:
+          Archive/Common: partial
+
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: archive-get
+        total: 4
+        perlReq: true
+
+        coverage:
+          command/archive/get/file: full
+          command/archive/get/get: full
+
+        # This test is flapping on co6 which seems to be due to some race condition.  The tests are under active development, so for
+        # now we are disabling the co6 tests in the hopes that the cause will be caught later.  It seems fairly certain that this is
+        # some sort of issue with the test and not the underlying code.  No flakiness has been seen in the integration tests and
+        # this issue has never happened on another vm.
+        vm:
+          - co7
+          - u12
+          - u14
+          - u16
+          - u18
+          - d8
+
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: archive-get-perl
+        total: 3
+
+        coverage:
+          Archive/Base: full
+          Archive/Get/Async: full
+          Archive/Get/File: partial
+          Archive/Get/Get: partial
+
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: archive-push
+        total: 1
+        perlReq: true
+
+        coverage:
+          command/archive/push/push: full
+
+      # ----------------------------------------------------------------------------------------------------------------------------
+      - name: archive-push-perl
+        total: 7
+
+        coverage:
+          Archive/Push/Async: full
+          Archive/Push/File: partial
+          Archive/Push/Push: full
+          Protocol/Local/Master: full
+
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: command
         total: 1
@@ -651,80 +728,6 @@ unit:
         coverage:
           command/remote/remote: full
 
-  # ********************************************************************************************************************************
-  - name: archive
-
-    test:
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: common
-        total: 6
-
-        coverage:
-          command/archive/common: full
-
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: common-perl
-        total: 6
-
-        coverage:
-          Archive/Common: partial
-
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: push-perl
-        total: 7
-
-        coverage:
-          Archive/Push/Async: full
-          Archive/Push/File: partial
-          Archive/Push/Push: full
-          Protocol/Local/Master: full
-
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: push
-        total: 1
-        perlReq: true
-
-        coverage:
-          command/archive/push/push: full
-
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: info-unit-perl
-        total: 4
-
-        coverage:
-          Archive/Info: partial
-
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: get
-        total: 4
-        perlReq: true
-
-        coverage:
-          command/archive/get/file: full
-          command/archive/get/get: full
-
-        # This test is flapping on co6 which seems to be due to some race condition.  The tests are under active development, so for
-        # now we are disabling the co6 tests in the hopes that the cause will be caught later.  It seems fairly certain that this is
-        # some sort of issue with the test and not the underlying code.  No flakiness has been seen in the integration tests and
-        # this issue has never happened on another vm.
-        vm:
-          - co7
-          - u12
-          - u14
-          - u16
-          - u18
-          - d8
-
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: get-perl
-        total: 3
-
-        coverage:
-          Archive/Base: full
-          Archive/Get/Async: full
-          Archive/Get/File: partial
-          Archive/Get/Get: partial
-
   # ********************************************************************************************************************************
   - name: backup
 
@@ -737,13 +740,6 @@ unit:
           Backup/Common: full
           Backup/Backup: partial
 
-      # ----------------------------------------------------------------------------------------------------------------------------
-      - name: info-unit-perl
-        total: 3
-
-        coverage:
-          Backup/Info: partial
-
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: file-unit-perl
         total: 2
diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchiveCommonPerlTest.pm b/test/lib/pgBackRestTest/Module/Command/CommandArchiveCommonPerlTest.pm
similarity index 99%
rename from test/lib/pgBackRestTest/Module/Archive/ArchiveCommonPerlTest.pm
rename to test/lib/pgBackRestTest/Module/Command/CommandArchiveCommonPerlTest.pm
index 84d77cef9..2847a0ed1 100644
--- a/test/lib/pgBackRestTest/Module/Archive/ArchiveCommonPerlTest.pm
+++ b/test/lib/pgBackRestTest/Module/Command/CommandArchiveCommonPerlTest.pm
@@ -1,7 +1,7 @@
 ####################################################################################################################################
 # Archive Common Tests
 ####################################################################################################################################
-package pgBackRestTest::Module::Archive::ArchiveCommonPerlTest;
+package pgBackRestTest::Module::Command::CommandArchiveCommonPerlTest;
 use parent 'pgBackRestTest::Env::HostEnvTest';
 
 ####################################################################################################################################
diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchiveGetPerlTest.pm b/test/lib/pgBackRestTest/Module/Command/CommandArchiveGetPerlTest.pm
similarity index 99%
rename from test/lib/pgBackRestTest/Module/Archive/ArchiveGetPerlTest.pm
rename to test/lib/pgBackRestTest/Module/Command/CommandArchiveGetPerlTest.pm
index e15a957f8..b341ef51f 100644
--- a/test/lib/pgBackRestTest/Module/Archive/ArchiveGetPerlTest.pm
+++ b/test/lib/pgBackRestTest/Module/Command/CommandArchiveGetPerlTest.pm
@@ -1,7 +1,7 @@
 ####################################################################################################################################
 # Archive Get and Base Tests
 ####################################################################################################################################
-package pgBackRestTest::Module::Archive::ArchiveGetPerlTest;
+package pgBackRestTest::Module::Command::CommandArchiveGetPerlTest;
 use parent 'pgBackRestTest::Env::HostEnvTest';
 
 ####################################################################################################################################
diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchivePushPerlTest.pm b/test/lib/pgBackRestTest/Module/Command/CommandArchivePushPerlTest.pm
similarity index 99%
rename from test/lib/pgBackRestTest/Module/Archive/ArchivePushPerlTest.pm
rename to test/lib/pgBackRestTest/Module/Command/CommandArchivePushPerlTest.pm
index 7ea38b38d..f2a3cc796 100644
--- a/test/lib/pgBackRestTest/Module/Archive/ArchivePushPerlTest.pm
+++ b/test/lib/pgBackRestTest/Module/Command/CommandArchivePushPerlTest.pm
@@ -1,7 +1,7 @@
 ####################################################################################################################################
 # Archive Push Tests
 ####################################################################################################################################
-package pgBackRestTest::Module::Archive::ArchivePushPerlTest;
+package pgBackRestTest::Module::Command::CommandArchivePushPerlTest;
 use parent 'pgBackRestTest::Env::HostEnvTest';
 
 ####################################################################################################################################
diff --git a/test/lib/pgBackRestTest/Module/Archive/ArchiveInfoUnitPerlTest.pm b/test/lib/pgBackRestTest/Module/Info/InfoInfoArchivePerlTest.pm
similarity index 99%
rename from test/lib/pgBackRestTest/Module/Archive/ArchiveInfoUnitPerlTest.pm
rename to test/lib/pgBackRestTest/Module/Info/InfoInfoArchivePerlTest.pm
index 07b49c81f..b9bc11e39 100644
--- a/test/lib/pgBackRestTest/Module/Archive/ArchiveInfoUnitPerlTest.pm
+++ b/test/lib/pgBackRestTest/Module/Info/InfoInfoArchivePerlTest.pm
@@ -1,7 +1,7 @@
 ####################################################################################################################################
 # Unit tests for ArchiveInfo
 ####################################################################################################################################
-package pgBackRestTest::Module::Archive::ArchiveInfoUnitPerlTest;
+package pgBackRestTest::Module::Info::InfoInfoArchivePerlTest;
 use parent 'pgBackRestTest::Env::HostEnvTest';
 
 ####################################################################################################################################
diff --git a/test/lib/pgBackRestTest/Module/Backup/BackupInfoUnitPerlTest.pm b/test/lib/pgBackRestTest/Module/Info/InfoInfoBackupPerlTest.pm
similarity index 99%
rename from test/lib/pgBackRestTest/Module/Backup/BackupInfoUnitPerlTest.pm
rename to test/lib/pgBackRestTest/Module/Info/InfoInfoBackupPerlTest.pm
index 3368c81cd..35212e6e5 100644
--- a/test/lib/pgBackRestTest/Module/Backup/BackupInfoUnitPerlTest.pm
+++ b/test/lib/pgBackRestTest/Module/Info/InfoInfoBackupPerlTest.pm
@@ -1,7 +1,7 @@
 ####################################################################################################################################
 # Unit tests for BackupInfo
 ####################################################################################################################################
-package pgBackRestTest::Module::Backup::BackupInfoUnitPerlTest;
+package pgBackRestTest::Module::Info::InfoInfoBackupPerlTest;
 use parent 'pgBackRestTest::Env::HostEnvTest';
 
 ####################################################################################################################################
diff --git a/test/src/module/archive/commonTest.c b/test/src/module/command/archiveCommonTest.c
similarity index 100%
rename from test/src/module/archive/commonTest.c
rename to test/src/module/command/archiveCommonTest.c
diff --git a/test/src/module/archive/getTest.c b/test/src/module/command/archiveGetTest.c
similarity index 100%
rename from test/src/module/archive/getTest.c
rename to test/src/module/command/archiveGetTest.c
diff --git a/test/src/module/archive/pushTest.c b/test/src/module/command/archivePushTest.c
similarity index 100%
rename from test/src/module/archive/pushTest.c
rename to test/src/module/command/archivePushTest.c