diff --git a/app/origin_host.go b/app/origin_host.go
index 03e7921aa..d51676b6a 100644
--- a/app/origin_host.go
+++ b/app/origin_host.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"net/http"
-	"strings"
 
 	"github.com/gorilla/mux"
 
diff --git a/probe/docker/container_linux_test.go b/probe/docker/container_linux_test.go
index 5e4e76da8..3a73cceaa 100644
--- a/probe/docker/container_linux_test.go
+++ b/probe/docker/container_linux_test.go
@@ -66,14 +66,14 @@ func TestContainer(t *testing.T) {
 
 	// Now see if we go them
 	want := report.MakeNode().WithMetadata(map[string]string{
-		"docker_container_command":         " ",
-		"docker_container_created":         "01 Jan 01 00:00 UTC",
-		"docker_container_id":              "ping",
-		"docker_container_name":            "pong",
-		"docker_image_id":                  "baz",
-		"docker_label_foo1":                "bar1",
-		"docker_label_foo2":                "bar2",
-		"memory_usage":                     "12345",
+		"docker_container_command": " ",
+		"docker_container_created": "01 Jan 01 00:00 UTC",
+		"docker_container_id":      "ping",
+		"docker_container_name":    "pong",
+		"docker_image_id":          "baz",
+		"docker_label_foo1":        "bar1",
+		"docker_label_foo2":        "bar2",
+		"memory_usage":             "12345",
 	}).WithSets(report.Sets{
 		"docker_container_ports":           report.MakeStringSet("1.2.3.4:80->80/tcp", "81/tcp"),
 		"docker_container_ips":             report.MakeStringSet("1.2.3.4"),
diff --git a/probe/overlay/weave_test.go b/probe/overlay/weave_test.go
index 02914d48d..ac9a489d7 100644
--- a/probe/overlay/weave_test.go
+++ b/probe/overlay/weave_test.go
@@ -51,9 +51,9 @@ func TestWeaveTaggerOverlayTopology(t *testing.T) {
 			Container: report.Topology{
 				Nodes: report.Nodes{
 					nodeID: report.MakeNodeWith(map[string]string{
-						docker.ContainerID:            mockContainerID,
-						overlay.WeaveDNSHostname:      mockHostname,
-						overlay.WeaveMACAddress:       mockContainerMAC,
+						docker.ContainerID:       mockContainerID,
+						overlay.WeaveDNSHostname: mockHostname,
+						overlay.WeaveMACAddress:  mockContainerMAC,
 					}).WithSets(report.Sets{
 						docker.ContainerIPs:           report.MakeStringSet(mockContainerIP),
 						docker.ContainerIPsWithScopes: report.MakeStringSet(mockContainerIPWithScope),