diff --git a/test/Services/FunctionalTests/FunctionalTests.csproj b/test/Services/FunctionalTests/FunctionalTests.csproj
index 34fa68d42..b2e21957b 100644
--- a/test/Services/FunctionalTests/FunctionalTests.csproj
+++ b/test/Services/FunctionalTests/FunctionalTests.csproj
@@ -4,6 +4,16 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Services\Catalog\settings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="Services\Catalog\settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
@@ -23,7 +33,7 @@
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="settings.json">
+    <None Update="Services\Ordering\settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/test/Services/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs b/test/Services/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
index e524eedc9..2c8c1280b 100644
--- a/test/Services/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
+++ b/test/Services/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
@@ -14,7 +14,7 @@ namespace FunctionalTests.Services.Catalog
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");
             webHostBuilder.UseStartup<Startup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/FunctionalTests/Services/Catalog/settings.json b/test/Services/FunctionalTests/Services/Catalog/settings.json
new file mode 100644
index 000000000..aa5f2055b
--- /dev/null
+++ b/test/Services/FunctionalTests/Services/Catalog/settings.json
@@ -0,0 +1,7 @@
+{
+  "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
+  "ExternalCatalogBaseUrl": "http://localhost:5101",
+  "IdentityUrl": "http://localhost:5105",
+  "isTest": "true",
+  "EventBusConnection": "localhost"
+}
diff --git a/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs b/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
index 643a4d8c3..8c3c554e5 100644
--- a/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
+++ b/test/Services/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
@@ -12,7 +12,7 @@ namespace FunctionalTests.Services.Ordering
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");
             webHostBuilder.UseStartup<OrderingTestsStartup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/FunctionalTests/settings.json b/test/Services/FunctionalTests/Services/Ordering/settings.json
similarity index 100%
rename from test/Services/FunctionalTests/settings.json
rename to test/Services/FunctionalTests/Services/Ordering/settings.json
diff --git a/test/Services/IntegrationTests/IntegrationTests.csproj b/test/Services/IntegrationTests/IntegrationTests.csproj
index 3054fe98d..436731593 100644
--- a/test/Services/IntegrationTests/IntegrationTests.csproj
+++ b/test/Services/IntegrationTests/IntegrationTests.csproj
@@ -12,9 +12,16 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Services\Catalog\settings.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <!--<Content Include="settings.json;web.config">-->
-    <Content Include="settings.json">
+    <Content Include="Services\Catalog\settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Services\Ordering\settings.json">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </Content>
   </ItemGroup>
@@ -35,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="settings.json">
+    <Content Update="Services\Ordering\settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/test/Services/IntegrationTests/Services/Catalog/CatalogScenarioBase.cs b/test/Services/IntegrationTests/Services/Catalog/CatalogScenarioBase.cs
index 2d0c29baf..e70e4f8cf 100644
--- a/test/Services/IntegrationTests/Services/Catalog/CatalogScenarioBase.cs
+++ b/test/Services/IntegrationTests/Services/Catalog/CatalogScenarioBase.cs
@@ -12,7 +12,7 @@ namespace IntegrationTests.Services.Catalog
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Catalog");
             webHostBuilder.UseStartup<Startup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/IntegrationTests/Services/Catalog/settings.json b/test/Services/IntegrationTests/Services/Catalog/settings.json
new file mode 100644
index 000000000..3ea6703eb
--- /dev/null
+++ b/test/Services/IntegrationTests/Services/Catalog/settings.json
@@ -0,0 +1,6 @@
+{
+  "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word",
+  "ExternalCatalogBaseUrl": "http://localhost:5101",
+  "IdentityUrl": "http://localhost:5105",
+  "isTest": "true"
+}
diff --git a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs
index 8bd829e17..b4909e5a6 100644
--- a/test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs
+++ b/test/Services/IntegrationTests/Services/Ordering/OrderingScenarioBase.cs
@@ -10,7 +10,7 @@
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();            
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Ordering");
             webHostBuilder.UseStartup<OrderingTestsStartup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/IntegrationTests/settings.json b/test/Services/IntegrationTests/Services/Ordering/settings.json
similarity index 100%
rename from test/Services/IntegrationTests/settings.json
rename to test/Services/IntegrationTests/Services/Ordering/settings.json