diff --git a/tests_e2e/lisa/runbook/azure.yml b/tests_e2e/lisa/runbook/azure.yml
index 8f0ef40133..27d9d5bb1c 100644
--- a/tests_e2e/lisa/runbook/azure.yml
+++ b/tests_e2e/lisa/runbook/azure.yml
@@ -46,6 +46,7 @@ variable:
 notifier:
   - type: html
   - type: env_stats
+  - type: junit
 platform:
   - type: azure
     admin_username: $(user)
diff --git a/tests_e2e/lisa/testsuites/agent-bvt.py b/tests_e2e/lisa/testsuites/agent-bvt.py
index 7b3fa53d1a..b7151bd08b 100644
--- a/tests_e2e/lisa/testsuites/agent-bvt.py
+++ b/tests_e2e/lisa/testsuites/agent-bvt.py
@@ -1,17 +1,13 @@
 from assertpy import assert_that
-from pathlib import Path
+
+from tests_e2e.lisa.testsuites.agent_test_suite import AgentTestSuite
 from tests_e2e.lisa.tests.agent_bvt import custom_script
 
 from lisa import (
-    CustomScriptBuilder,
-    Logger,
-    Node,
     simple_requirement,
     TestCaseMetadata,
-    TestSuite,
     TestSuiteMetadata,
 )
-from lisa.sut_orchestrator.azure.common import get_node_context
 
 
 @TestSuiteMetadata(
@@ -22,20 +18,17 @@
     """,
     requirement=simple_requirement(unsupported_os=[]),
 )
-class AgentBvt(TestSuite):
+class AgentBvt(AgentTestSuite):
     @TestCaseMetadata(description="", priority=0)
-    def check_agent_version(self, node: Node, log: Logger) -> None:
-        script_path = CustomScriptBuilder(Path(__file__).parent.parent.joinpath("tests", "agent_bvt"), ["check_agent_version.py"])
-        script = node.tools[script_path]
-        result = script.run()
-        log.info(result.stdout)
-        log.error(result.stderr)
-        assert_that(result.exit_code).is_equal_to(0)
+    def main(self, *_, **__) -> None:
+        self.check_agent_version()
+        self.custom_script()
+
+    def check_agent_version(self) -> None:
+        exit_code = self._execute_remote_script(self._test_root.joinpath("lisa", "tests", "agent_bvt"), "check_agent_version.py")
+        assert_that(exit_code).is_equal_to(0)
+
+    def custom_script(self) -> None:
+        custom_script.main(self._subscription_id, self._resource_group_name, self._vm_name)
+
 
-    @TestCaseMetadata(description="", priority=0)
-    def custom_script(self, node: Node) -> None:
-        node_context = get_node_context(node)
-        subscription_id = node.features._platform.subscription_id
-        resource_group_name = node_context.resource_group_name
-        vm_name = node_context.vm_name
-        custom_script.main(subscription_id, resource_group_name, vm_name)
diff --git a/tests_e2e/lisa/testsuites/agent_test_suite.py b/tests_e2e/lisa/testsuites/agent_test_suite.py
new file mode 100644
index 0000000000..5644473831
--- /dev/null
+++ b/tests_e2e/lisa/testsuites/agent_test_suite.py
@@ -0,0 +1,53 @@
+from pathlib import Path, PurePath
+
+from lisa import (
+    CustomScriptBuilder,
+    TestSuite,
+    TestSuiteMetadata,
+)
+from lisa.sut_orchestrator.azure.common import get_node_context
+
+
+class AgentTestSuite(TestSuite):
+    def __init__(self, metadata: TestSuiteMetadata):
+        super().__init__(metadata)
+        self._log = None
+        self._node = None
+        self._test_root = None
+        self._subscription_id = None
+        self._resource_group_name = None
+        self._vm_name = None
+
+    def before_case(self, *_, **kwargs) -> None:
+        node = kwargs['node']
+        log = kwargs['log']
+        node_context = get_node_context(node)
+
+        self._log = log
+        self._node = node
+        self._test_root = Path(__file__).parent.parent.parent
+        self._subscription_id = node.features._platform.subscription_id
+        self._resource_group_name = node_context.resource_group_name
+        self._vm_name = node_context.vm_name
+
+    def after_case(self, *_, **__) -> None:
+        # Collect the logs on the test machine into a compressed tarball
+        self._log.info("Collecting logs on test machine [%s]...", self._node.name)
+        self._execute_remote_script(self._test_root.joinpath("scripts"), "collect_logs.sh")
+
+        # Copy the tarball to the local logs directory
+        remote_path = PurePath('/home') / self._node.connection_info['username'] / 'logs.tgz'
+        local_path = Path.home() / 'logs' / 'vm-logs-{0}.tgz'.format(self._node.name)
+        self._log.info("Copying %s:%s to %s...", self._node.name, remote_path, local_path)
+        self._node.shell.copy_back(remote_path, local_path)
+
+    def _execute_remote_script(self, path: Path, script: str) -> int:
+        custom_script_builder = CustomScriptBuilder(path, [script])
+        custom_script = self._node.tools[custom_script_builder]
+        self._log.info('Executing %s/%s...', path, script)
+        result = custom_script.run()
+        if result.stdout:
+            self._log.info('%s', result.stdout)
+        if result.stderr:
+            self._log.error('%s', result.stderr)
+        return result.exit_code
diff --git a/tests_e2e/scripts/collect_logs.sh b/tests_e2e/scripts/collect_logs.sh
new file mode 100755
index 0000000000..b557215d1c
--- /dev/null
+++ b/tests_e2e/scripts/collect_logs.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+logs_file_name="$HOME/logs.tgz"
+
+echo "Collecting logs to $logs_file_name ..."
+
+sudo tar --exclude='journal/*' --exclude='omsbundle' --exclude='omsagent' --exclude='mdsd' --exclude='scx*' \
+         --exclude='*.so' --exclude='*__LinuxDiagnostic__*' --exclude='*.zip' --exclude='*.deb' --exclude='*.rpm' \
+         -czf "$logs_file_name" \
+         /var/log \
+         /var/lib/waagent/ \
+         /etc/waagent.conf
+
+sudo chmod +r "$logs_file_name"
+
diff --git a/tests_e2e/scripts/execute_tests_container.sh b/tests_e2e/scripts/execute_tests_container.sh
index 0b0b1c2e9c..39424272a8 100755
--- a/tests_e2e/scripts/execute_tests_container.sh
+++ b/tests_e2e/scripts/execute_tests_container.sh
@@ -8,20 +8,34 @@ az acr login --name waagenttests
 
 docker pull waagenttests.azurecr.io/waagenttests:latest
 
-# Logs will be placed in this location. Make waagent (UID 1000 in the container) the owner.
-mkdir "$HOME/logs"
-sudo chown 1000 "$HOME/logs"
+# Logs will be placed in the staging directory. Make waagent (UID 1000 in the container) the owner so that it can write to that location
+sudo chown 1000 "$BUILD_ARTIFACTSTAGINGDIRECTORY"
 
 docker run --rm \
       --volume "$BUILD_SOURCESDIRECTORY:/home/waagent/WALinuxAgent" \
       --volume "$DOWNLOADSSHKEY_SECUREFILEPATH:/home/waagent/id_rsa" \
-      --volume "$HOME/logs:/home/waagent/logs" \
+      --volume "$BUILD_ARTIFACTSTAGINGDIRECTORY:/home/waagent/logs" \
       --env SUBSCRIPTION_ID \
       --env AZURE_CLIENT_ID \
       --env AZURE_CLIENT_SECRET \
       --env AZURE_TENANT_ID \
       waagenttests.azurecr.io/waagenttests \
-      bash --login -c '~/WALinuxAgent/tests_e2e/scripts/execute_tests.sh'
-
-ls -lR "$HOME/logs"
-
+      bash --login -c '$HOME/WALinuxAgent/tests_e2e/scripts/execute_tests.sh'
+
+# Retake ownership of the staging directory
+sudo find "$BUILD_ARTIFACTSTAGINGDIRECTORY" -exec chown "$USER" {} \;
+
+# LISA organizes its logs in a tree similar to
+#
+#    .../20221130
+#    .../20221130/20221130-160013-749
+#    .../20221130/20221130-160013-749/environments
+#    .../20221130/20221130-160013-749/lisa-20221130-160013-749.log
+#    .../20221130/20221130-160013-749/lisa.junit.xml
+#    etc
+#
+# Remove the first 2 levels of the tree (which indicate the time of the test run) to make navigation
+# in the Azure Pipelines UI easier.
+#
+mv "$BUILD_ARTIFACTSTAGINGDIRECTORY"/[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/*/* "$BUILD_ARTIFACTSTAGINGDIRECTORY"
+rm -r "$BUILD_ARTIFACTSTAGINGDIRECTORY"/[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]
diff --git a/tests_e2e/templates/execute-tests.yml b/tests_e2e/templates/execute-tests.yml
index 0e9a4cb1fd..71dd6c50c1 100644
--- a/tests_e2e/templates/execute-tests.yml
+++ b/tests_e2e/templates/execute-tests.yml
@@ -32,3 +32,14 @@ jobs:
           AZURE_CLIENT_SECRET: $(AZURE-CLIENT-SECRET)
           AZURE_TENANT_ID: $(AZURE-TENANT-ID)
           SUBSCRIPTION_ID: $(SUBSCRIPTION-ID)
+
+      - task: PublishTestResults@2
+        inputs:
+          testResultsFormat: 'JUnit'
+          testResultsFiles: '**/*junit.xml'
+          searchFolder: $(Build.ArtifactStagingDirectory)
+          testRunTitle: 'Publish test results'
+
+      - publish: $(Build.ArtifactStagingDirectory)
+        artifact: 'test-logs'
+        displayName: 'Publish test logs'