Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r4229 -r4230
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 4229)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 4230)
@@ -38,7 +38,21 @@
 public class PipingBlighTests
 {
     private const double tolerance = 0.0005;
-
+    private const string workingDir = @"TestFiles\";
+    private string oldWorkingDir;
+    
+    [SetUp]
+    public void TestFixtureSetup()
+    {
+        oldWorkingDir = Directory.GetCurrentDirectory();   
+        Directory.SetCurrentDirectory(workingDir);   
+    }
+    
+    [TearDown]
+    public void TestFixtureTearDown()
+    {
+        Directory.SetCurrentDirectory(oldWorkingDir);   
+    }
     /// <summary>Test for different segmentFailureMechanismType</summary>
     /// <param name="segmentFailureMechanismType">The soilprobabilities are set tot the specified segmentFailureMechanismType</param>
     [Test]
@@ -242,10 +256,9 @@
     [TestCase(4)]
     public void TestDAMSUP_169(int maxCores)
     {
-        const string mapTestFiles = @"TestFiles\";
-        string fullInputFilename = Path.Combine(mapTestFiles, "DAMSUP169Bligh.xml");
         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
-        string inputString = File.ReadAllText(fullInputFilename);
+        const string fileName = @"DAMSUP169Bligh.xml";
+        string inputString = File.ReadAllText(fileName);
         var engineInterface = new EngineInterface(inputString);
         Assert.IsNotNull(engineInterface.DamProjectData);
         engineInterface.DamProjectData.MaxCalculationCores = maxCores;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r4229 -r4230
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 4229)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 4230)
@@ -39,7 +39,22 @@
 public class WtiPipingSellmeijerRevisedTests
 {
     private const double tolerance = 0.0005;
-
+    private const string workingDir = @"TestFiles\";
+    private string oldWorkingDir;
+    
+    [SetUp]
+    public void TestFixtureSetup()
+    {
+        oldWorkingDir = Directory.GetCurrentDirectory();   
+        Directory.SetCurrentDirectory(workingDir);   
+    }
+    
+    [TearDown]
+    public void TestFixtureTearDown()
+    {
+        Directory.SetCurrentDirectory(oldWorkingDir);   
+    }
+    
     /// <summary>Test for different segmentFailureMechanismType</summary>
     /// <param name="segmentFailureMechanismType">The soilprobabilities are set tot the specified segmentFailureMechanismType</param>
     [Test]
@@ -273,10 +288,9 @@
     [TestCase(4)]
     public void TestDAMSUP_169(int maxCores)
     {
-        const string mapTestFiles = @"TestFiles\";
-        string fullInputFilename = Path.Combine(mapTestFiles, "DAMSUP169WtiSellmeijerRevised.xml");
         Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
-        string inputString = File.ReadAllText(fullInputFilename);
+        const string fileName = @"DAMSUP169WtiSellmeijerRevised.xml";
+        string inputString = File.ReadAllText(fileName);
         var engineInterface = new EngineInterface(inputString);
         Assert.IsNotNull(engineInterface.DamProjectData);
         engineInterface.DamProjectData.MaxCalculationCores = maxCores;