--- src/VBox/ValidationKit/testdriver/vbox.py.orig	2020-07-10 02:58:10.000000000 +1000
+++ src/VBox/ValidationKit/testdriver/vbox.py	2020-08-22 00:03:47.480577000 +1000
@@ -1038,7 +1038,7 @@
         cMsFudge      = 1;
         sVBoxSVC      = '%s/VBoxSVC' % (self.oBuild.sInstallPath,); ## @todo .exe and stuff.
         if self.fVBoxSvcInDebugger:
-            if self.sHost in ('darwin', 'freebsd', 'linux', 'solaris', ):
+            if self.sHost in ('bsdsunix', 'darwin', 'freebsd', 'linux', 'solaris', ):
                 # Start VBoxSVC in gdb in a new terminal.
                 #sTerm = '/usr/bin/gnome-terminal'; - doesn't work, some fork+exec stuff confusing us.
                 sTerm = '/usr/bin/xterm';
@@ -1080,7 +1080,7 @@
             else:
                 reporter.error('Port me!');
         else: # Run without a debugger attached.
-            if self.sHost in ('darwin', 'freebsd', 'linux', 'solaris', ):
+            if self.sHost in ('bsdsunix', 'darwin', 'freebsd', 'linux', 'solaris', ):
                 #
                 # XPCOM - We can use a pipe to let VBoxSVC notify us when it's ready.
                 #
@@ -1832,7 +1832,7 @@
                 if os.path.isfile(sVBoxSvcRelLog + sSuff):
                     reporter.addLogFile(sVBoxSvcRelLog + sSuff, 'log/release/svc', 'Release log file for VBoxSVC');
             # Testbox debugging - START - TEMPORARY, REMOVE ASAP.
-            if self.sHost in ('darwin', 'freebsd', 'linux', 'solaris', ):
+            if self.sHost in ('bsdsunix', 'darwin', 'freebsd', 'linux', 'solaris', ):
                 try:
                     print '> ls -la %s' % (os.path.join(self.sScratchPath, 'VBoxUserHome'),);
                     utils.processCall(['ls', '-la', os.path.join(self.sScratchPath, 'VBoxUserHome')]);