diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1ecbcdad..e2369539 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,6 @@
-#### 0.5.3 - June 28, 2016
+#### 0.5.3 - July 10, 2016
 - Supported Newtonsoft.Json v9.0.1
+- FIXED: props and fields name collision during quotes compilation [#38](https://github.com/fsprojects/SwaggerProvider/pull/38)
 
 #### 0.5.2 - June 23, 2016
 - FIXED: 201 status codes should be used as a return type for operations [#34](https://github.com/fsprojects/SwaggerProvider/issues/34)
diff --git a/build.fsx b/build.fsx
index 99d212cf..9102311c 100644
--- a/build.fsx
+++ b/build.fsx
@@ -139,11 +139,20 @@ Target "BuildTests" (fun _ ->
 // --------------------------------------------------------------------------------------
 // Run the unit tests using test runner
 
-Target "ExecuteTests" (fun _ ->
+Target "ExecuteUnitTests" (fun _ ->
     !! testAssemblies
     |> NUnit3 (fun p ->
         { p with
-            //Domain = NUnit3DomainModel.NoDomainModel
+            Where = "cat != Integration"
+            TimeOut = TimeSpan.FromMinutes 20.
+            Labels = LabelsLevel.All})
+)
+
+Target "ExecuteIntegrationTests" (fun _ ->
+    !! testAssemblies
+    |> NUnit3 (fun p ->
+        { p with
+            Where = "cat == Integration"
             TimeOut = TimeSpan.FromMinutes 20.
             Labels = LabelsLevel.All})
 )
@@ -354,7 +363,8 @@ Target "All" DoNothing
   ==> "CopyBinaries"
   ==> "StartServer"
   ==> "BuildTests"
-  ==> "ExecuteTests"
+  ==> "ExecuteUnitTests"
+  =?> ("ExecuteIntegrationTests", not <| (hasBuildParam "skipTests"))
   ==> "StopServer"
   ==> "RunTests"
   //=?> ("GenerateReferenceDocs",isLocalBuild)
diff --git a/tests/SwaggerProvider.ProviderTests/APIs.Guru.FSC.Tests.fs b/tests/SwaggerProvider.ProviderTests/APIs.Guru.FSC.Tests.fs
index b2059872..0ba584bd 100644
--- a/tests/SwaggerProvider.ProviderTests/APIs.Guru.FSC.Tests.fs
+++ b/tests/SwaggerProvider.ProviderTests/APIs.Guru.FSC.Tests.fs
@@ -22,7 +22,7 @@ let toTestCase (url:string) =
 let JsonSchemasSource = APIsGuru.JsonSchemas |> Array.map toTestCase
 
 
-[<Test; TestCaseSource("JsonSchemasSource")>]
+[<Test; TestCaseSource("JsonSchemasSource"); Category("Integration")>]
 let ``Compile TP`` url =
     let tempFile = Path.GetTempFileName()
     let fs = Path.ChangeExtension(tempFile, ".fs")
diff --git a/tests/SwaggerProvider.Tests/Schema.Parser.Tests.fs b/tests/SwaggerProvider.Tests/Schema.Parser.Tests.fs
index 9e4b1131..5bd548fe 100644
--- a/tests/SwaggerProvider.Tests/Schema.Parser.Tests.fs
+++ b/tests/SwaggerProvider.Tests/Schema.Parser.Tests.fs
@@ -93,11 +93,11 @@ let JsonSchemasSource =
     Array.concat [schemasFromTPTests; APIsGuru.JsonSchemas]
     |> Array.map toTestCase
 
-[<Test; TestCaseSource("JsonSchemasSource")>]
+[<Test; TestCaseSource("JsonSchemasSource"); Category("Integration")>]
 let ``Parse Json Schema`` (url:string) =
     parserTestBody (JsonValue.Parse >> JsonNodeAdapter) url
 
 let YamlSchemasSource = APIsGuru.YamlSchemas |> Array.map toTestCase
-[<Test; TestCaseSource("YamlSchemasSource")>]
+[<Test; TestCaseSource("YamlSchemasSource"); Category("Integration")>]
 let ``Parse Yaml Schema`` url =
     parserTestBody (SwaggerProvider.YamlParser.Parse >> YamlNodeAdapter) url
\ No newline at end of file