diff --git a/test/expect/mock-all-001.log b/test/expect/mock-all-001.log
index 87024a7ca..827d13256 100644
--- a/test/expect/mock-all-001.log
+++ b/test/expect/mock-all-001.log
@@ -13,16 +13,6 @@ Get version.
 
 Displays installed pgBackRest version.
 
-info all stanzas - no stanzas exist (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn info
-------------------------------------------------------------------------------------------------------------------------------------
-No stanzas exist in the repository.
-
-info all stanzas - no stanzas exist (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[]
-
 stanza-create db - create required data for stanza (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db --no-online stanza-create
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -3313,351 +3303,6 @@ db-version="9.4"
 [backrest]
 backrest-checksum="[CHECKSUM]"
 
-info db stanza - normal output (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --stanza=db info
-------------------------------------------------------------------------------------------------------------------------------------
-stanza: db
-    status: ok
-    cipher: none
-
-    db (current)
-        wal archive min/max (9.4-1): none present
-
-        full backup: [BACKUP-FULL-2]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 192KB, backup size: 192KB
-            repository size: 192KB, repository backup size: 192KB
-
-        diff backup: [BACKUP-DIFF-2]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 192KB, backup size: 32B
-            repository size: 192KB, repository backup size: 32B
-            backup reference list: [BACKUP-FULL-2]
-
-        incr backup: [BACKUP-INCR-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 192KB, backup size: 13B
-            repository size: 192KB, repository backup size: 13B
-            backup reference list: [BACKUP-FULL-2], [BACKUP-DIFF-2]
-
-        incr backup: [BACKUP-INCR-4]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 176KB, backup size: 8B
-            repository size: 176KB, repository backup size: 8B
-            backup reference list: [BACKUP-FULL-2], [BACKUP-DIFF-2], [BACKUP-INCR-3]
-
-        diff backup: [BACKUP-DIFF-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 176KB, backup size: 46B
-            repository size: 176KB, repository backup size: 46B
-            backup reference list: [BACKUP-FULL-2]
-
-        incr backup: [BACKUP-INCR-5]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 176KB, backup size: 0B
-            repository size: 176KB, repository backup size: 0B
-            backup reference list: [BACKUP-FULL-2], [BACKUP-DIFF-3]
-
-        diff backup: [BACKUP-DIFF-4]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 176KB, backup size: 37B
-            repository size: 176KB, repository backup size: 37B
-            backup reference list: [BACKUP-FULL-2]
-
-        full backup: [BACKUP-FULL-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 176KB, backup size: 176KB
-            repository size: 2.4KB, repository backup size: 2.4KB
-
-info db stanza - normal output (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --stanza=db --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "archive" : [
-            {
-                "database" : {
-                    "id" : 1
-                },
-                "id" : "9.4-1",
-                "max" : null,
-                "min" : null
-            }
-        ],
-        "backup" : [
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-2]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-2]",
-                "prior" : "[BACKUP-FULL-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-INCR-3]",
-                "prior" : "[BACKUP-DIFF-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]",
-                    "[BACKUP-DIFF-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "incr"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-INCR-4]",
-                "prior" : "[BACKUP-INCR-3]",
-                "reference" : [
-                    "[BACKUP-FULL-2]",
-                    "[BACKUP-DIFF-2]",
-                    "[BACKUP-INCR-3]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "incr"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-3]",
-                "prior" : "[BACKUP-FULL-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-INCR-5]",
-                "prior" : "[BACKUP-DIFF-3]",
-                "reference" : [
-                    "[BACKUP-FULL-2]",
-                    "[BACKUP-DIFF-3]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "incr"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-4]",
-                "prior" : "[BACKUP-FULL-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-3]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            }
-        ],
-        "cipher" : "none",
-        "db" : [
-            {
-                "id" : 1,
-                "system-id" : 1000000000000000094,
-                "version" : "9.4"
-            }
-        ],
-        "name" : "db",
-        "status" : {
-            "code" : 0,
-            "message" : "ok"
-        }
-    }
-]
-
 expire full=1 (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --repo1-retention-full=1  --stanza=db expire
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -4088,158 +3733,6 @@ P00   INFO: restore command end: completed successfully
 # Recovery settings generated by pgBackRest restore on [TIMESTAMP]
 restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
 
-info all stanzas - normal output (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn info
-------------------------------------------------------------------------------------------------------------------------------------
-stanza: db
-    status: ok
-    cipher: none
-
-    db (current)
-        wal archive min/max (9.4-1): none present
-
-        full backup: [BACKUP-FULL-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 176KB, backup size: 176KB
-            repository size: 2.4KB, repository backup size: 2.4KB
-
-        diff backup: [BACKUP-DIFF-5]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 176KB, backup size: 9B
-            repository size: 2.4KB, repository backup size: 29B
-            backup reference list: [BACKUP-FULL-3]
-
-stanza: db_empty
-    status: error (missing stanza data)
-    cipher: none
-
-info all stanzas - normal output (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "archive" : [
-            {
-                "database" : {
-                    "id" : 1
-                },
-                "id" : "9.4-1",
-                "max" : null,
-                "min" : null
-            }
-        ],
-        "backup" : [
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-3]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-5]",
-                "prior" : "[BACKUP-FULL-3]",
-                "reference" : [
-                    "[BACKUP-FULL-3]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            }
-        ],
-        "cipher" : "none",
-        "db" : [
-            {
-                "id" : 1,
-                "system-id" : 1000000000000000094,
-                "version" : "9.4"
-            }
-        ],
-        "name" : "db",
-        "status" : {
-            "code" : 0,
-            "message" : "ok"
-        }
-    },
-    {
-        "archive" : [],
-        "backup" : [],
-        "cipher" : "none",
-        "db" : [],
-        "name" : "db_empty",
-        "status" : {
-            "code" : 3,
-            "message" : "missing stanza data"
-        }
-    }
-]
-
-info bogus stanza - bogus stanza (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --stanza=bogus info
-------------------------------------------------------------------------------------------------------------------------------------
-stanza: bogus
-    status: error (missing stanza path)
-
-info bogus stanza - bogus stanza (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --stanza=bogus --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "backup" : [],
-        "db" : [],
-        "name" : "bogus",
-        "status" : {
-            "code" : 1,
-            "message" : "missing stanza path"
-        }
-    }
-]
-
 > ls -1Rtr [TEST_PATH]/db-master/repo/backup/db/backup.history
 ------------------------------------------------------------------------------------------------------------------------------------
 [TEST_PATH]/db-master/repo/backup/db/backup.history:
diff --git a/test/expect/mock-all-002.log b/test/expect/mock-all-002.log
index c5a3d9f46..fa7f733b5 100644
--- a/test/expect/mock-all-002.log
+++ b/test/expect/mock-all-002.log
@@ -1,16 +1,6 @@
 run 002 - rmt 1, s3 1, enc 1, delta 0
 =====================================
 
-info all stanzas - no stanzas exist (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn info
-------------------------------------------------------------------------------------------------------------------------------------
-No stanzas exist in the repository.
-
-info all stanzas - no stanzas exist (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[]
-
 stanza-create db - create required data for stanza (backup host)
 > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db --no-online stanza-create
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -2698,351 +2688,6 @@ db-version="9.4"
 [backrest]
 backrest-checksum="[CHECKSUM]"
 
-info db stanza - normal output (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --stanza=db info
-------------------------------------------------------------------------------------------------------------------------------------
-stanza: db
-    status: ok
-    cipher: aes-256-cbc
-
-    db (current)
-        wal archive min/max (9.4-1): none present
-
-        full backup: [BACKUP-FULL-2]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 160KB, backup size: 160KB
-            repository size: 160.5KB, repository backup size: 160.5KB
-
-        diff backup: [BACKUP-DIFF-2]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 160KB, backup size: 41B
-            repository size: 160.7KB, repository backup size: 192B
-            backup reference list: [BACKUP-FULL-2]
-
-        incr backup: [BACKUP-INCR-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 160KB, backup size: 13B
-            repository size: 160.7KB, repository backup size: 64B
-            backup reference list: [BACKUP-FULL-2], [BACKUP-DIFF-2]
-
-        incr backup: [BACKUP-INCR-4]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 144KB, backup size: 8B
-            repository size: 144.7KB, repository backup size: 32B
-            backup reference list: [BACKUP-FULL-2], [BACKUP-DIFF-2], [BACKUP-INCR-3]
-
-        diff backup: [BACKUP-DIFF-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 144KB, backup size: 55B
-            repository size: 144.7KB, repository backup size: 256B
-            backup reference list: [BACKUP-FULL-2]
-
-        incr backup: [BACKUP-INCR-5]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 144KB, backup size: 0B
-            repository size: 144.7KB, repository backup size: 0B
-            backup reference list: [BACKUP-FULL-2], [BACKUP-DIFF-3]
-
-        diff backup: [BACKUP-DIFF-4]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 144KB, backup size: 46B
-            repository size: 144.6KB, repository backup size: 192B
-            backup reference list: [BACKUP-FULL-2]
-
-        full backup: [BACKUP-FULL-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 144KB, backup size: 144KB
-            repository size: 2.5KB, repository backup size: 2.5KB
-
-info db stanza - normal output (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=warn --stanza=db --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "archive" : [
-            {
-                "database" : {
-                    "id" : 1
-                },
-                "id" : "9.4-1",
-                "max" : null,
-                "min" : null
-            }
-        ],
-        "backup" : [
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-2]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-2]",
-                "prior" : "[BACKUP-FULL-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-INCR-3]",
-                "prior" : "[BACKUP-DIFF-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]",
-                    "[BACKUP-DIFF-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "incr"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-INCR-4]",
-                "prior" : "[BACKUP-INCR-3]",
-                "reference" : [
-                    "[BACKUP-FULL-2]",
-                    "[BACKUP-DIFF-2]",
-                    "[BACKUP-INCR-3]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "incr"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-3]",
-                "prior" : "[BACKUP-FULL-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-INCR-5]",
-                "prior" : "[BACKUP-DIFF-3]",
-                "reference" : [
-                    "[BACKUP-FULL-2]",
-                    "[BACKUP-DIFF-3]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "incr"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-4]",
-                "prior" : "[BACKUP-FULL-2]",
-                "reference" : [
-                    "[BACKUP-FULL-2]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-3]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            }
-        ],
-        "cipher" : "aes-256-cbc",
-        "db" : [
-            {
-                "id" : 1,
-                "system-id" : 1000000000000000094,
-                "version" : "9.4"
-            }
-        ],
-        "name" : "db",
-        "status" : {
-            "code" : 0,
-            "message" : "ok"
-        }
-    }
-]
-
 expire full=1 (backup host)
 > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --repo1-retention-full=1  --stanza=db expire
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -3289,143 +2934,6 @@ restore, remap - no tablespace remap (db-master host)
 # Recovery settings generated by pgBackRest restore on [TIMESTAMP]
 restore_command = '[BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db archive-get %f "%p"'
 
-info all stanzas - normal output (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=warn info
-------------------------------------------------------------------------------------------------------------------------------------
-stanza: db
-    status: ok
-    cipher: aes-256-cbc
-
-    db (current)
-        wal archive min/max (9.4-1): none present
-
-        full backup: [BACKUP-FULL-3]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 144KB, backup size: 144KB
-            repository size: 2.5KB, repository backup size: 2.5KB
-
-        diff backup: [BACKUP-DIFF-5]
-            timestamp start/stop: [TIMESTAMP-STR]
-            wal start/stop: n/a
-            database size: 144.1KB, backup size: 9B
-            repository size: 2.6KB, repository backup size: 48B
-            backup reference list: [BACKUP-FULL-3]
-
-info all stanzas - normal output (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "archive" : [
-            {
-                "database" : {
-                    "id" : 1
-                },
-                "id" : "9.4-1",
-                "max" : null,
-                "min" : null
-            }
-        ],
-        "backup" : [
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-3]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 1
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-DIFF-5]",
-                "prior" : "[BACKUP-FULL-3]",
-                "reference" : [
-                    "[BACKUP-FULL-3]"
-                ],
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "diff"
-            }
-        ],
-        "cipher" : "aes-256-cbc",
-        "db" : [
-            {
-                "id" : 1,
-                "system-id" : 1000000000000000094,
-                "version" : "9.4"
-            }
-        ],
-        "name" : "db",
-        "status" : {
-            "code" : 0,
-            "message" : "ok"
-        }
-    }
-]
-
-info bogus stanza - bogus stanza (backup host)
-> [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --log-level-console=warn --stanza=bogus info
-------------------------------------------------------------------------------------------------------------------------------------
-stanza: bogus
-    status: error (missing stanza path)
-
-info bogus stanza - bogus stanza (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --stanza=bogus --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "backup" : [],
-        "db" : [],
-        "name" : "bogus",
-        "status" : {
-            "code" : 1,
-            "message" : "missing stanza path"
-        }
-    }
-]
-
 diff backup - config file not validated on remote (backup host)
 > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --no-online --log-level-console=info --type=diff --stanza=db backup
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/test/expect/mock-stanza-001.log b/test/expect/mock-stanza-001.log
index ca401a288..3dbac7626 100644
--- a/test/expect/mock-stanza-001.log
+++ b/test/expect/mock-stanza-001.log
@@ -476,115 +476,6 @@ spool-path=[TEST_PATH]/db-master/spool
 archive-copy=y
 start-fast=y
 
-info all stanzas - db upgraded - db-1 and db-2 listed (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "archive" : [
-            {
-                "database" : {
-                    "id" : 2
-                },
-                "id" : "9.4-2",
-                "max" : "000000010000000100000001",
-                "min" : "000000010000000100000001"
-            },
-            {
-                "database" : {
-                    "id" : 3
-                },
-                "id" : "9.5-3",
-                "max" : "000000010000000100000001",
-                "min" : "000000010000000100000001"
-            }
-        ],
-        "backup" : [
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 2
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-1]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 3
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-2]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            }
-        ],
-        "cipher" : "none",
-        "db" : [
-            {
-                "id" : 1,
-                "system-id" : 1000000000000000093,
-                "version" : "9.3"
-            },
-            {
-                "id" : 2,
-                "system-id" : 1000000000000000094,
-                "version" : "9.4"
-            },
-            {
-                "id" : 3,
-                "system-id" : 1000000000000000095,
-                "version" : "9.5"
-            }
-        ],
-        "name" : "db",
-        "status" : {
-            "code" : 0,
-            "message" : "ok"
-        }
-    }
-]
-
 stanza-delete db - fail on missing stop file (db-master host)
 > [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --stanza=db stanza-delete
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/test/expect/mock-stanza-002.log b/test/expect/mock-stanza-002.log
index 44d0da0ef..55d979319 100644
--- a/test/expect/mock-stanza-002.log
+++ b/test/expect/mock-stanza-002.log
@@ -587,115 +587,6 @@ repo1-type=s3
 archive-copy=y
 start-fast=y
 
-info all stanzas - db upgraded - db-1 and db-2 listed (db-master host)
-> [CONTAINER-EXEC] db-master [BACKREST-BIN] --config=[TEST_PATH]/db-master/pgbackrest.conf --log-level-console=warn --output=json info
-------------------------------------------------------------------------------------------------------------------------------------
-[
-    {
-        "archive" : [
-            {
-                "database" : {
-                    "id" : 2
-                },
-                "id" : "9.4-2",
-                "max" : "000000010000000100000001",
-                "min" : "000000010000000100000001"
-            },
-            {
-                "database" : {
-                    "id" : 3
-                },
-                "id" : "9.5-3",
-                "max" : "000000010000000100000001",
-                "min" : "000000010000000100000001"
-            }
-        ],
-        "backup" : [
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 2
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-1]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            },
-            {
-                "archive" : {
-                    "start" : null,
-                    "stop" : null
-                },
-                "backrest" : {
-                    "format" : 5,
-                    "version" : "[VERSION-1]"
-                },
-                "database" : {
-                    "id" : 3
-                },
-                "info" : {
-                    "delta" : [DELTA],
-                    "repository" : {
-                        "delta" : [DELTA],
-                        "size" : [SIZE]
-                    },
-                    "size" : [SIZE]
-                },
-                "label" : "[BACKUP-FULL-2]",
-                "prior" : null,
-                "reference" : null,
-                "timestamp" : {
-                    "start" : [TIMESTAMP],
-                    "stop" : [TIMESTAMP]
-                },
-                "type" : "full"
-            }
-        ],
-        "cipher" : "aes-256-cbc",
-        "db" : [
-            {
-                "id" : 1,
-                "system-id" : 1000000000000000093,
-                "version" : "9.3"
-            },
-            {
-                "id" : 2,
-                "system-id" : 1000000000000000094,
-                "version" : "9.4"
-            },
-            {
-                "id" : 3,
-                "system-id" : 1000000000000000095,
-                "version" : "9.5"
-            }
-        ],
-        "name" : "db",
-        "status" : {
-            "code" : 0,
-            "message" : "ok"
-        }
-    }
-]
-
 stanza-delete db - fail on missing stop file (backup host)
 > [CONTAINER-EXEC] backup [BACKREST-BIN] --config=[TEST_PATH]/backup/pgbackrest.conf --stanza=db stanza-delete
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm
index 214ec94cc..4daeb588e 100644
--- a/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm
+++ b/test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm
@@ -308,11 +308,6 @@ sub run
             $oHostDbMaster->executeSimple($self->backrestExe() . " help version", {oLogTest => $self->expect()});
         }
 
-        # Backup Info (with no stanzas)
-        #---------------------------------------------------------------------------------------------------------------------------
-        $oHostDbMaster->info('no stanzas exist');
-        $oHostDbMaster->info('no stanzas exist', {strOutput => CFGOPTVAL_INFO_OUTPUT_JSON});
-
         # Full backup
         #---------------------------------------------------------------------------------------------------------------------------
         my $strType = CFGOPTVAL_BACKUP_TYPE_FULL;
@@ -1259,11 +1254,6 @@ sub run
         $strFullBackup = $oHostBackup->backup(
             $strType, 'update file', {oExpectedManifest => \%oManifest});
 
-        # Backup Info
-        #---------------------------------------------------------------------------------------------------------------------------
-        $oHostDbMaster->info('normal output', {strStanza => $oHostDbMaster->stanza()});
-        $oHostBackup->info('normal output', {strStanza => $oHostBackup->stanza(), strOutput => CFGOPTVAL_INFO_OUTPUT_JSON});
-
         # Call expire
         #---------------------------------------------------------------------------------------------------------------------------
         $oHostBackup->expire({iRetentionFull => 1});
@@ -1354,16 +1344,6 @@ sub run
         $oManifest{&MANIFEST_SECTION_BACKUP_TARGET}{'pg_tblspc/2'}{&MANIFEST_SUBKEY_PATH} = '../../tablespace/ts2';
         $oManifest{&MANIFEST_SECTION_TARGET_LINK}{'pg_data/pg_tblspc/2'}{&MANIFEST_SUBKEY_DESTINATION} = '../../tablespace/ts2';
 
-        # Backup Info (with an empty stanza)
-        #---------------------------------------------------------------------------------------------------------------------------
-        forceStorageMode(storageRepo(), 'backup', 'g+w');
-        storageRepo()->pathCreate(storageRepo()->pathGet('backup/db_empty'), {strMode => '0770'});
-
-        $oHostBackup->info('normal output');
-        $oHostDbMaster->info('normal output', {strOutput => CFGOPTVAL_INFO_OUTPUT_JSON});
-        $oHostBackup->info('bogus stanza', {strStanza => BOGUS});
-        $oHostDbMaster->info('bogus stanza', {strStanza => BOGUS, strOutput => CFGOPTVAL_INFO_OUTPUT_JSON});
-
         # Dump out history path at the end to verify all history files are being recorded.  This test is only performed locally
         # because for some reason sort order is different when this command is executed via ssh (even though the content of the
         # directory is identical).
diff --git a/test/lib/pgBackRestTest/Module/Mock/MockStanzaTest.pm b/test/lib/pgBackRestTest/Module/Mock/MockStanzaTest.pm
index b8d2bfb1f..0565dab1a 100644
--- a/test/lib/pgBackRestTest/Module/Mock/MockStanzaTest.pm
+++ b/test/lib/pgBackRestTest/Module/Mock/MockStanzaTest.pm
@@ -231,7 +231,7 @@ sub run
         # Restore archive.info
         forceStorageMove(storageRepo(), $strArchiveInfoOldFile, $strArchiveInfoFile, {bRecurse => false});
 
-        # Push a WAL and create a backup in the new DB to confirm diff changed to full and info command displays the JSON correctly
+        # Push a WAL and create a backup in the new DB to confirm diff changed to full
         #--------------------------------------------------------------------------------------------------------------------------
         storageTest()->put($strArchiveTestFile, $self->walGenerateContent(PG_VERSION_95));
         $oHostDbMaster->archivePush($strWalPath, $strArchiveTestFile, 1);
@@ -241,9 +241,6 @@ sub run
             {strOptionalParam => '--repo1-retention-full=2 --no-' . cfgOptionName(CFGOPT_ONLINE)});
         $oHostBackup->backupEnd('full', $oExecuteBackup, undef, false);
 
-        # Confirm info command displays the JSON correctly
-        $oHostDbMaster->info('db upgraded - db-1 and db-2 listed', {strOutput => CFGOPTVAL_INFO_OUTPUT_JSON});
-
         # Delete the stanza
         #--------------------------------------------------------------------------------------------------------------------------
         $oHostBackup->stanzaDelete('fail on missing stop file', {iExpectedExitStatus => ERROR_FILE_MISSING});