diff --git a/extractor.go b/extractor.go
index 81938ba..10ce4db 100644
--- a/extractor.go
+++ b/extractor.go
@@ -36,8 +36,7 @@ func serviceDef(opts server.Options) *registry.Service {
 
 	node := &registry.Node{
 		Id:       opts.Name + "-" + opts.Id,
-		Address:  addr,
-		Port:     port,
+		Address:  fmt.Sprintf("%s:%d", addr, port),
 		Metadata: opts.Metadata,
 	}
 
diff --git a/http_test.go b/http_test.go
index 483d9fd..2ee85b0 100644
--- a/http_test.go
+++ b/http_test.go
@@ -50,7 +50,7 @@ func TestHTTPServer(t *testing.T) {
 	}
 
 	// make request
-	rsp, err := http.Get(fmt.Sprintf("http://%s:%d", service[0].Nodes[0].Address, service[0].Nodes[0].Port))
+	rsp, err := http.Get(fmt.Sprintf("http://%s", service[0].Nodes[0].Address))
 	if err != nil {
 		t.Fatal(err)
 	}