diff --git a/dns_test.go b/dns_test.go
index e266c7eb..245e307c 100644
--- a/dns_test.go
+++ b/dns_test.go
@@ -242,7 +242,8 @@ func TestMsgLenTest(t *testing.T) {
 	}
 }
 
-func BenchmarkMsgLen(b *testing.B) {
+// Padded to fix alignment
+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 a0f39d86..4aaf7b2b 100644
--- a/server_test.go
+++ b/server_test.go
@@ -65,7 +65,8 @@ func TestServing(t *testing.T) {
 	}
 }
 
-func BenchmarkServing(b *testing.B) {
+// Padded to fix alignment
+func BenchmarkServe____(b *testing.B) {
 	b.StopTimer()
 	HandleFunc("miek.nl.", HelloServer)
 	a := runtime.GOMAXPROCS(4)
@@ -92,7 +93,7 @@ func HelloServerCompress(w ResponseWriter, req *Msg) {
 	w.WriteMsg(m)
 }
 
-func BenchmarkServingCompress(b *testing.B) {
+func BenchmarkServeCompress(b *testing.B) {
 	b.StopTimer()
 	HandleFunc("miek.nl.", HelloServerCompress)
 	a := runtime.GOMAXPROCS(4)