diff --git a/config/muxer_test.go b/config/muxer_test.go
index 6fe5aa2c4..0a8609205 100644
--- a/config/muxer_test.go
+++ b/config/muxer_test.go
@@ -73,14 +73,14 @@ func TestCatchDuplicateTransportsMuxer(t *testing.T) {
 	}{
 		"no duplicate transports": {
 			h:             h,
-			transports:    []MsMuxC{MsMuxC{yamuxMuxer, "yamux"}},
+			transports:    []MsMuxC{{yamuxMuxer, "yamux"}},
 			expectedError: "",
 		},
 		"duplicate transports": {
 			h: h,
 			transports: []MsMuxC{
-				MsMuxC{yamuxMuxer, "yamux"},
-				MsMuxC{yamuxMuxer, "yamux"},
+				{yamuxMuxer, "yamux"},
+				{yamuxMuxer, "yamux"},
 			},
 			expectedError: "duplicate muxer transport: yamux",
 		},
diff --git a/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go
index ed9254728..8fadaac6e 100644
--- a/p2p/host/basic/basic_host_test.go
+++ b/p2p/host/basic/basic_host_test.go
@@ -558,7 +558,7 @@ func TestAddrResolution(t *testing.T) {
 	p2paddr3 := ma.StringCast("/ip4/192.0.2.1/tcp/123/p2p/" + p2.Pretty())
 
 	backend := &madns.MockResolver{
-		TXT: map[string][]string{"_dnsaddr.example.com": []string{
+		TXT: map[string][]string{"_dnsaddr.example.com": {
 			"dnsaddr=" + p2paddr2.String(), "dnsaddr=" + p2paddr3.String(),
 		}},
 	}
@@ -607,14 +607,14 @@ func TestAddrResolutionRecursive(t *testing.T) {
 
 	backend := &madns.MockResolver{
 		TXT: map[string][]string{
-			"_dnsaddr.example.com": []string{
+			"_dnsaddr.example.com": {
 				"dnsaddr=" + p2paddr1i.String(),
 				"dnsaddr=" + p2paddr2i.String(),
 			},
-			"_dnsaddr.foo.example.com": []string{
+			"_dnsaddr.foo.example.com": {
 				"dnsaddr=" + p2paddr1f.String(),
 			},
-			"_dnsaddr.bar.example.com": []string{
+			"_dnsaddr.bar.example.com": {
 				"dnsaddr=" + p2paddr2i.String(),
 			},
 		},
diff --git a/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go
index c7c1fd128..c770f94aa 100644
--- a/p2p/host/basic/natmgr.go
+++ b/p2p/host/basic/natmgr.go
@@ -131,8 +131,8 @@ func (nmgr *natManager) sync() {
 // new mappings.
 func (nmgr *natManager) doSync() {
 	ports := map[string]map[int]bool{
-		"tcp": map[int]bool{},
-		"udp": map[int]bool{},
+		"tcp": {},
+		"udp": {},
 	}
 	for _, maddr := range nmgr.net.ListenAddresses() {
 		// Strip the IP