diff --git a/app/api_topology_test.go b/app/api_topology_test.go
index 2e7ac7cfc..68752b98c 100644
--- a/app/api_topology_test.go
+++ b/app/api_topology_test.go
@@ -62,10 +62,8 @@ func TestAll(t *testing.T) {
 	}
 }
 
-func TestAPITopologyApplications(t *testing.T) {
+func TestAPITopologyContainers(t *testing.T) {
 	ts := httptest.NewServer(Router(StaticReport{}))
-	defer ts.Close()
-	is404(t, ts, "/api/topology/applications/foobar")
 	{
 		body := getRawJSON(t, ts, "/api/topology/containers")
 		var topo APITopology
@@ -77,6 +75,12 @@ func TestAPITopologyApplications(t *testing.T) {
 			t.Error(test.Diff(want, have))
 		}
 	}
+}
+
+func TestAPITopologyApplications(t *testing.T) {
+	ts := httptest.NewServer(Router(StaticReport{}))
+	defer ts.Close()
+	is404(t, ts, "/api/topology/applications/foobar")
 	{
 		body := getRawJSON(t, ts, "/api/topology/applications/"+expected.ServerProcessID)
 		var node APINode
diff --git a/render/topologies.go b/render/topologies.go
index e3df66fd8..36688b47a 100644
--- a/render/topologies.go
+++ b/render/topologies.go
@@ -36,8 +36,8 @@ type ProcessWithContainerNameRenderer struct{}
 // Render produces a process graph where the minor labels contain the
 // container name, if found.
 func (r ProcessWithContainerNameRenderer) Render(rpt report.Report) RenderableNodes {
-	var processes = ProcessRenderer.Render(rpt)
-	var containers = LeafMap{
+	processes := ProcessRenderer.Render(rpt)
+	containers := LeafMap{
 		Selector: report.SelectContainer,
 		Mapper:   MapContainerIdentity,
 		Pseudo:   PanicPseudoNode,