Index: /trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py	(revision 80697)
+++ /trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py	(revision 80698)
@@ -922,6 +922,8 @@
         self._waitForTestManagerConnectivity(30);
 
+        # Upload the log on failure.  Do it early if the extra cleanups below causes trouble.
         if fRc is False and os.path.isfile(sLogFile):
             reporter.addLogFile(sLogFile, 'log/uninstaller', "Verbose MSI uninstallation log file");
+            sLogFile = None;
 
         # Log driver service states (should ls \Driver\VBox* and \Device\VBox*).
@@ -963,4 +965,8 @@
         if fHadLeftovers:
             self._waitForTestManagerConnectivity(30);
+
+        # Upload the log if we have any leftovers and didn't upload it already.
+        if sLogFile is not None and (fRc is False or fHadLeftovers) and os.path.isfile(sLogFile):
+            reporter.addLogFile(sLogFile, 'log/uninstaller', "Verbose MSI uninstallation log file");
 
         return fRc;