diff --git a/test/Microsoft.AspNet.Server.KestrelTests/ServerAddressFacts.cs b/test/Microsoft.AspNet.Server.KestrelTests/ServerAddressFacts.cs
new file mode 100644
index 0000000000..5b280c5e68
--- /dev/null
+++ b/test/Microsoft.AspNet.Server.KestrelTests/ServerAddressFacts.cs
@@ -0,0 +1,47 @@
+using Microsoft.AspNet.Server.Kestrel;
+using Xunit;
+
+namespace Microsoft.AspNet.Server.KestrelTests
+{
+    public class ServerAddressFacts
+    {
+        [Theory]
+        [InlineData("")]
+        [InlineData("//noscheme")]
+        public void FromUriReturnsNullForSchemelessUrls(string url)
+        {
+            Assert.Null(ServerAddress.FromUrl(url));
+        }
+
+        [Theory]
+        [InlineData("://emptyscheme", "", "emptyscheme", 0, "")]
+        [InlineData("http://localhost", "http", "localhost", 80, "")]
+        [InlineData("http://www.example.com", "http", "www.example.com", 80, "")]
+        [InlineData("https://www.example.com", "https", "www.example.com", 443, "")]
+        [InlineData("http://www.example.com/", "http", "www.example.com", 80, "/")]
+        [InlineData("http://www.example.com/foo?bar=baz", "http", "www.example.com", 80, "/foo?bar=baz")]
+        [InlineData("http://www.example.com:5000", "http", "www.example.com", 5000, "")]
+        [InlineData("https://www.example.com:5000", "https", "www.example.com", 5000, "")]
+        [InlineData("http://www.example.com:5000/", "http", "www.example.com", 5000, "/")]
+        [InlineData("http://www.example.com:NOTAPORT", "http", "www.example.com:NOTAPORT", 80, "")]
+        [InlineData("https://www.example.com:NOTAPORT", "https", "www.example.com:NOTAPORT", 443, "")]
+        [InlineData("http://www.example.com:NOTAPORT/", "http", "www.example.com:NOTAPORT", 80, "/")]
+        [InlineData("http://foo:/tmp/kestrel-test.sock:5000/doesn't/matter", "http", "foo:", 80, "/tmp/kestrel-test.sock:5000/doesn't/matter")]
+        [InlineData("http://unix:foo/tmp/kestrel-test.sock", "http", "unix:foo", 80, "/tmp/kestrel-test.sock")]
+        [InlineData("http://unix:5000/tmp/kestrel-test.sock", "http", "unix", 5000, "/tmp/kestrel-test.sock")]
+        [InlineData("http://unix:/tmp/kestrel-test.sock", "http", "unix:/tmp/kestrel-test.sock", 0, "")]
+        [InlineData("https://unix:/tmp/kestrel-test.sock", "https", "unix:/tmp/kestrel-test.sock", 0, "")]
+        [InlineData("http://unix:/tmp/kestrel-test.sock:", "http", "unix:/tmp/kestrel-test.sock", 0, "")]
+        [InlineData("http://unix:/tmp/kestrel-test.sock:/", "http", "unix:/tmp/kestrel-test.sock", 0, "/")]
+        [InlineData("http://unix:/tmp/kestrel-test.sock:5000/doesn't/matter", "http", "unix:/tmp/kestrel-test.sock", 0, "5000/doesn't/matter")]
+        public void UrlsAreParsedCorrectly(string url, string scheme, string host, int port, string path)
+        {
+            var serverAddress = ServerAddress.FromUrl(url);
+
+            Assert.Equal(scheme, serverAddress.Scheme);
+            Assert.Equal(host, serverAddress.Host);
+            Assert.Equal(port, serverAddress.Port);
+            Assert.Equal(path, serverAddress.Path);
+        }
+    }
+}