--- src/VBox/ValidationKit/testdriver/vboxtestvms.py.orig	2020-07-10 02:58:10.000000000 +1000
+++ src/VBox/ValidationKit/testdriver/vboxtestvms.py	2020-08-22 00:08:43.776849000 +1000
@@ -103,12 +103,14 @@
     [ 'Solaris',        'Solaris',               g_k32,    1, 256, ['sol10',  'sol10u[0-9]']],
     [ 'Solaris_64',     'Solaris_64',            g_k64,    1, 256, ['sol10-64', 'sol10u-64[0-9]']],
     [ 'Solaris_64',     'Solaris11_64',          g_k64,    1, 256, ['sol11u1']],
-    [ 'BSD',            'FreeBSD_64',            g_k32_64, 1, 1, ['bs-.*']], # boot sectors, wanted 64-bit type.
+    [ 'BSDSUniX',       'BSDSUniX_64',           g_k32_64, 1, 1, ['bs-.*']], # boot sectors, wanted 64-bit type.
+    [ 'FreeBSD',        'FreeBSD_64',            g_k32_64, 1, 1, ['bs-.*']], # boot sectors, wanted 64-bit type.
 ];
 
 
 ## @name Guest OS type string constants.
 ## @{
+g_ksGuestOsTypeBSDSUniX = 'bsdsunix';
 g_ksGuestOsTypeDarwin  = 'darwin';
 g_ksGuestOsTypeFreeBSD = 'freebsd';
 g_ksGuestOsTypeLinux   = 'linux';
@@ -145,8 +147,9 @@
 #   g_ksParavirtProviderMinimal is removed from the list in order to get maximum number of unique choices
 #   during independent test runs when paravirt provider is taken randomly.
 g_kdaParavirtProvidersSupported = {
-    g_ksGuestOsTypeDarwin  : ( g_ksParavirtProviderMinimal, ),
+    g_ksGuestOsTypeBSDSUniX : ( g_ksParavirtProviderNone, ),
     g_ksGuestOsTypeFreeBSD : ( g_ksParavirtProviderNone, ),
+    g_ksGuestOsTypeDarwin  : ( g_ksParavirtProviderMinimal, ),
     g_ksGuestOsTypeLinux   : ( g_ksParavirtProviderNone, g_ksParavirtProviderHyperV, g_ksParavirtProviderKVM),
     g_ksGuestOsTypeOS2     : ( g_ksParavirtProviderNone, ),
     g_ksGuestOsTypeSolaris : ( g_ksParavirtProviderNone, ),
@@ -213,6 +216,8 @@
         if sType.lower().startswith('darwin'):
             return g_ksGuestOsTypeDarwin
         if sType.lower().startswith('bsd'):
+            return g_ksGuestOsTypeBSDSUniX
+        if sType.lower().endswith('bsd'):
             return g_ksGuestOsTypeFreeBSD
         if sType.lower().startswith('linux'):
             return g_ksGuestOsTypeLinux