Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs
===================================================================
diff -u -r846 -r848
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 846)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 848)
@@ -7,6 +7,7 @@
 using Deltares.Standard;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
+using Deltares.Standard.Language;
 using NUnit.Framework;
 
 namespace Deltares.DSoilModel.Forms.Tests
@@ -17,10 +18,13 @@
         private DSoilModelGeometryEditor dsmGeometryEditor;
         private MainForm mainForm;
         private SpatialEditor spatialEditor;
-        
+        private LanguageType oldLanguage;
+
         [SetUp]
         public void SetUp()
         {
+            oldLanguage = LocalizationManager.CurrentLanguage;
+            LocalizationManager.CurrentLanguage = LanguageType.Dutch;
             About.IgnoreAssemblyErrors = true;
             mainForm = new MainForm();
             var project = new DSoilModelProject();
@@ -35,6 +39,7 @@
         public void TearDown()
         {
             dsmGeometryEditor = null;
+            LocalizationManager.CurrentLanguage = oldLanguage;
         }
 
         private DSoilModelProject CreateProjectForSoilProfile2D(SoilProfile2D profile)
Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs
===================================================================
diff -u -r847 -r848
--- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 847)
+++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 848)
@@ -326,7 +326,7 @@
 
             // by loading the settings dialog here, we can prevent it from showing the units tab page (temporary for WTI)
             mainForm.CreateSettingsDialog(true, false);
-            // Make sure language stays Dutch
+            // Make sure language stays Dutch (even when "old" settings tell it to be english).
             if (mainForm.ProgramSettings.Language != LanguageType.Dutch)
             {
                 // setting the same language again produces side effects
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs
===================================================================
diff -u -r723 -r848
--- src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 723)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 848)
@@ -40,10 +40,13 @@
         private const string TestDataFolder = @"..\..\Deltares.DSoilModel.Data.Tests\TestFiles";
         private const string TestOutputFolder = TestDataFolder + @"SoilModelDatabaseTest\";
         private bool oldIsDataEventPublishStopped;
+        private LanguageType oldLanguage;
 
         [TestFixtureSetUp]
         public void FixtureSetup()
         {
+            oldLanguage = LocalizationManager.CurrentLanguage;
+            LocalizationManager.CurrentLanguage = LanguageType.Dutch;
             oldIsDataEventPublishStopped = DataEventPublisher.IsDataEventPublishStopped;
             DataEventPublisher.IsDataEventPublishStopped = true;
             if (!Directory.Exists(TestOutputFolder))
@@ -56,6 +59,7 @@
         public void FixtureTearDown()
         {
             DataEventPublisher.IsDataEventPublishStopped = oldIsDataEventPublishStopped;
+            LocalizationManager.CurrentLanguage = oldLanguage;
         }
 
         [Test]
@@ -199,7 +203,6 @@
         [Category(Categories.Slow)]
         public void GenerateWtiSosSoilFile()
         {
-            LocalizationManager.CurrentLanguage = LanguageType.Dutch;
             // purpose here is to convert the WTI_SOS from CSV/SHP to .Soil format in a script, instead of having to use the D-SoilModel GUI for this
 
             // generate a .soil file containing the complete Wti SOS, and compare the input / output