diff --git a/.gitignore b/.gitignore
index 801273e9db..33bd16adb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ nuget.exe
 node_modules
 *.sln.ide
 project.lock.json
-.vs/
\ No newline at end of file
+.vs/
+launchSettings.json
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index c0befaffcf..924ab82ec7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,14 @@ addons:
     - libssl-dev
     - libunwind8
     - zlib1g
+before_install:
+  - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; fi
 env:
   - KOREBUILD_DNU_RESTORE_CORECLR=true KOREBUILD_TEST_DNXCORE=true
 mono:
   - 4.0.5
+os:
+  - linux
+  - osx
 script:
   - ./build.sh --quiet verify
diff --git a/samples/DatabaseErrorPageSample/Properties/launchSettings.json b/samples/DatabaseErrorPageSample/Properties/launchSettings.json
deleted file mode 100644
index 6e0a888707..0000000000
--- a/samples/DatabaseErrorPageSample/Properties/launchSettings.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:41542/",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNET_ENV": "Development"
-      }
-    },
-    "web": {
-      "commandName": "web",
-      "commandLineArgs": " ",
-      "environmentVariables": {
-        "Hosting:Environment": "Development"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
index 530d65f332..6ba071931c 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
@@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Diagnostics
                     "TestFiles/SourceFile.txt"
                 };
 
-                if (!TestPlatformHelper.IsLinux)
+                if (!(TestPlatformHelper.IsLinux || TestPlatformHelper.IsMac))
                 {
                     data.Add(@"TestFiles\SourceFile.txt");
                 }