diff --git a/report/detailed_node_test.go b/report/detailed_node_test.go
index b09304016..deaa03ce2 100644
--- a/report/detailed_node_test.go
+++ b/report/detailed_node_test.go
@@ -1,7 +1,69 @@
 package report_test
 
-import "testing"
+import (
+	"reflect"
+	"testing"
+
+	"github.com/weaveworks/scope/report"
+)
 
 func TestMakeDetailedNode(t *testing.T) {
 	t.Skip("TODO")
 }
+
+func TestOriginTable(t *testing.T) {
+	if _, ok := report.OriginTable(reportFixture, "not-found"); ok {
+		t.Errorf("unknown origin ID gave unexpected success")
+	}
+	for originID, want := range map[string]report.Table{
+		client54001EndpointNodeID: {
+			Title:   "Origin Endpoint",
+			Numeric: false,
+			Rows:    []report.Row{{"Host name", clientHostName, ""}},
+		},
+		//report.MakeProcessNodeID(clientHostID, "4242"): {
+		//	Title:   "Origin Process",
+		//	Numeric: false,
+		//	Rows: []report.Row{
+		//		{"Host name", "client.host.com", ""},
+		//	},
+		//},
+		clientAddressNodeID: {
+			Title:   "Origin Address",
+			Numeric: false,
+			Rows: []report.Row{
+				{"Host name", clientHostName, ""},
+			},
+		},
+		//report.MakeProcessNodeID(clientHostID, "4242"): {
+		//	Title:   "Origin Process",
+		//	Numeric: false,
+		//	Rows: []report.Row{
+		//		{"Process name", "curl", ""},
+		//		{"PID", "4242", ""},
+		//		{"Docker container ID", "a1b2c3d4e5", ""},
+		//		{"Docker container name", "fixture-container", ""},
+		//		{"Docker image ID", "0000000000", ""},
+		//		{"Docker image name", "fixture/container:latest", ""},
+		//	},
+		//},
+		serverHostNodeID: {
+			Title:   "Origin Host",
+			Numeric: false,
+			Rows: []report.Row{
+				{"Host name", serverHostName, ""},
+				{"Load", "0.01 0.01 0.01", ""},
+				{"Operating system", "Linux", ""},
+			},
+		},
+	} {
+		have, ok := report.OriginTable(reportFixture, originID)
+		if !ok {
+			t.Errorf("%q: not OK", originID)
+			continue
+		}
+		if !reflect.DeepEqual(want, have) {
+			t.Errorf("%q: %s", originID, diff(want, have))
+		}
+	}
+}
diff --git a/report/report_fixture_test.go b/report/report_fixture_test.go
index 0534047ed..479d8d5a1 100644
--- a/report/report_fixture_test.go
+++ b/report/report_fixture_test.go
@@ -15,6 +15,7 @@ var reportFixture = report.Report{
 			client54001EndpointNodeID: report.NodeMetadata{
 				"process_node_id": report.MakeProcessNodeID(clientHostID, "4242"),
 				"address_node_id": report.MakeAddressNodeID(clientHostID, clientAddress),
+				"host_name":       clientHostName,
 			},
 			client54002EndpointNodeID: report.NodeMetadata{
 				//"process_node_id": report.MakeProcessNodeID(clientHostID, "4242"), // leave it out, to test a branch in Render