diff --git a/dns_test.go b/dns_test.go
index 245e307c..e266c7eb 100644
--- a/dns_test.go
+++ b/dns_test.go
@@ -242,8 +242,7 @@ func TestMsgLenTest(t *testing.T) {
 	}
 }
 
-// Padded to fix alignment
-func BenchmarkMsgLen____(b *testing.B) {
+func BenchmarkMsgLen(b *testing.B) {
 	b.StopTimer()
 	makeMsg := func(question string, ans, ns, e []RR) *Msg {
 		msg := new(Msg)
diff --git a/server_test.go b/server_test.go
index 4aaf7b2b..a0f39d86 100644
--- a/server_test.go
+++ b/server_test.go
@@ -65,8 +65,7 @@ func TestServing(t *testing.T) {
 	}
 }
 
-// Padded to fix alignment
-func BenchmarkServe____(b *testing.B) {
+func BenchmarkServing(b *testing.B) {
 	b.StopTimer()
 	HandleFunc("miek.nl.", HelloServer)
 	a := runtime.GOMAXPROCS(4)
@@ -93,7 +92,7 @@ func HelloServerCompress(w ResponseWriter, req *Msg) {
 	w.WriteMsg(m)
 }
 
-func BenchmarkServeCompress(b *testing.B) {
+func BenchmarkServingCompress(b *testing.B) {
 	b.StopTimer()
 	HandleFunc("miek.nl.", HelloServerCompress)
 	a := runtime.GOMAXPROCS(4)