diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go
index 5b8986eba..e08fcc51e 100644
--- a/command/agent/agent_test.go
+++ b/command/agent/agent_test.go
@@ -150,7 +150,7 @@ func TestAgent_CheckAdvertiseAddrsSettings(t *testing.T) {
 	}
 	serfLanPort := agent.consulConfig().SerfLANConfig.MemberlistConfig.AdvertisePort
 	if serfLanPort != 1233 {
-		t.Fatalf("SerfLan is not properly set to '1233': %s", serfLanPort)
+		t.Fatalf("SerfLan is not properly set to '1233': %d", serfLanPort)
 	}
 	serfWanAddr := agent.consulConfig().SerfWANConfig.MemberlistConfig.AdvertiseAddr
 	if serfWanAddr != "127.0.0.43" {
@@ -158,7 +158,7 @@ func TestAgent_CheckAdvertiseAddrsSettings(t *testing.T) {
 	}
 	serfWanPort := agent.consulConfig().SerfWANConfig.MemberlistConfig.AdvertisePort
 	if serfWanPort != 1234 {
-		t.Fatalf("SerfWan is not properly set to '1234': %s", serfWanPort)
+		t.Fatalf("SerfWan is not properly set to '1234': %d", serfWanPort)
 	}
 	rpc := agent.consulConfig().RPCAdvertise
 	if rpc != c.AdvertiseAddrs.RPC {
diff --git a/command/agent/dns_test.go b/command/agent/dns_test.go
index f18818d5d..fe430b715 100644
--- a/command/agent/dns_test.go
+++ b/command/agent/dns_test.go
@@ -185,7 +185,7 @@ func TestDNS_NodeLookup(t *testing.T) {
 	}
 
 	if len(in.Ns) != 1 {
-		t.Fatalf("Bad: %#v", in, len(in.Answer))
+		t.Fatalf("Bad: %#v %#v", in, len(in.Answer))
 	}
 
 	soaRec, ok := in.Ns[0].(*dns.SOA)
@@ -1835,7 +1835,7 @@ func TestDNS_NonExistingLookup(t *testing.T) {
 	}
 
 	if len(in.Ns) != 1 {
-		t.Fatalf("Bad: %#v", in, len(in.Answer))
+		t.Fatalf("Bad: %#v %#v", in, len(in.Answer))
 	}
 
 	soaRec, ok := in.Ns[0].(*dns.SOA)