diff --git a/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr b/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
index 2bd552e652..28e34a4b85 100644
--- a/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
+++ b/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dpr
@@ -89,7 +89,9 @@ uses
Keyman.System.RegExGroupHelperRSP19902 in '..\..\global\delphi\general\Keyman.System.RegExGroupHelperRSP19902.pas',
DUnitX.Loggers.TeamCity in '..\..\global\delphi\general\DUnitX.Loggers.TeamCity.pas',
BCP47Tag in '..\..\global\delphi\general\BCP47Tag.pas',
- Keyman.System.Standards.BCP47SubtagRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas';
+ Keyman.System.Standards.BCP47SubtagRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
+ Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
+ Keyman.System.Standards.LibPalasoAllTagsRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.LibPalasoAllTagsRegistry.pas';
var
runner : ITestRunner;
diff --git a/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj b/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
index 46cc4da013..6d0a3c8876 100644
--- a/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
+++ b/windows/src/unit-tests/keyboard-package-versions/KeyboardPackageVersionsTestSuite.dproj
@@ -177,6 +177,8 @@
+
+
Cfg_2
Base
diff --git a/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dpr b/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
index d84d25faf2..dbce0e9d20 100644
--- a/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
+++ b/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dpr
@@ -22,14 +22,15 @@ uses
StockFileNames in '..\..\global\delphi\cust\StockFileNames.pas',
utilstr in '..\..\global\delphi\general\utilstr.pas',
Unicode in '..\..\global\delphi\general\Unicode.pas',
- Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
Keyman.System.Standards.ISO6393ToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.ISO6393ToBCP47Registry.pas',
Keyman.Test.System.KMXFileLanguagesTest in 'Keyman.Test.System.KMXFileLanguagesTest.pas',
Keyman.System.Standards.LCIDToBCP47Registry in '..\..\global\delphi\standards\Keyman.System.Standards.LCIDToBCP47Registry.pas',
Keyman.System.LanguageCodeUtils in '..\..\global\delphi\general\Keyman.System.LanguageCodeUtils.pas',
DUnitX.Loggers.TeamCity in '..\..\global\delphi\general\DUnitX.Loggers.TeamCity.pas',
kmxfileconsts in '..\..\global\delphi\general\kmxfileconsts.pas',
- Keyman.System.Standards.BCP47SubtagRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas';
+ Keyman.System.Standards.BCP47SubtagRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SubtagRegistry.pas',
+ Keyman.System.Standards.BCP47SuppressScriptRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.BCP47SuppressScriptRegistry.pas',
+ Keyman.System.Standards.LibPalasoAllTagsRegistry in '..\..\global\delphi\standards\Keyman.System.Standards.LibPalasoAllTagsRegistry.pas';
var
runner : ITestRunner;
diff --git a/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dproj b/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
index e8b9ee25e6..13117bf12e 100644
--- a/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
+++ b/windows/src/unit-tests/kmx-file-languages/KMXFileLanguagesTestSuite.dproj
@@ -100,7 +100,6 @@
-
@@ -108,6 +107,8 @@
+
+
Cfg_2
Base