diff --git a/resolver/resolverEdns_test.go b/resolver/resolverEdns_test.go
deleted file mode 100644
index 29898581..00000000
--- a/resolver/resolverEdns_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package resolver
-
-import (
-	"testing"
-	"dns"
-	"fmt"
-)
-
-func TestResolverEdns(t *testing.T) {
-	res := new(Resolver)
-	ch := res.NewQuerier()
-
-	res.Servers = []string{"127.0.0.1"}
-	res.Timeout = 2
-	res.Attempts = 1
-
-	m := new(dns.Msg)
-	m.MsgHdr.RecursionDesired = true //only set this bit
-	m.Question = make([]dns.Question, 1)
-
-	// Add EDNS rr
-	edns := new(dns.RR_OPT)
-	edns.Hdr.Name = "." // must . be for edns
-	edns.Hdr.Rrtype = dns.TypeOPT
-	// You can handle an OTP RR as any other, but there
-	// are some convience functions
-	edns.SetUDPSize(2048)
-	edns.SetDo()
-	edns.Option = make([]dns.Option, 1)
-	edns.SetNsidToHex("") // Empty to request it
-
-	// ask something
-	m.Question[0] = dns.Question{"powerdns.nl", dns.TypeDNSKEY, dns.ClassINET}
-	m.Extra = make([]dns.RR, 1)
-	m.Extra[0] = edns
-
-	ch <- Msg{m, nil}
-	in := <-ch
-	if in.Dns != nil {
-		if in.Dns.Rcode != dns.RcodeSuccess {
-			t.Log("Failed to get an valid answer")
-			t.Fail()
-		}
-		fmt.Printf("%v\n", in.Dns)
-	} else {
-		fmt.Printf("Failed to get a good anwer")
-	}
-	ch <- Msg{nil, nil}
-	<-ch // wait for ch to close channel
-}
diff --git a/resolver/resolverTsig_test.go b/resolver/resolverTsig_test.go
deleted file mode 100644
index fa72a48a..00000000
--- a/resolver/resolverTsig_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package resolver
-
-import (
-	"testing"
-	"dns"
-	"fmt"
-)
-
-func TestResolverTsig(t *testing.T) {
-	res := new(Resolver)
-	ch := res.NewQuerier()
-
-	res.Servers = []string{"127.0.0.1"}
-	res.Timeout = 2
-	res.Attempts = 1
-
-	m := new(dns.Msg)
-	m.MsgHdr.RecursionDesired = true //only set this bit
-	m.Question = make([]dns.Question, 1)
-
-	// ask something
-	m.Question[0] = dns.Question{"powerdns.nl", dns.TypeDNSKEY, dns.ClassINET}
-	m.Extra = make([]dns.RR, 1)
-        m.SetId()
-
-        tsig := new(dns.RR_TSIG)
-        tsig.Hdr.Name = "miek.nl"       // for tsig this is the key's name
-        tsig.Hdr.Rrtype = dns.TypeTSIG
-        tsig.Hdr.Class = dns.ClassANY
-        tsig.Hdr.Ttl = 0
-        tsig.Generate(m, "geheim")
-        // Add it to the msg
-        m.Extra[0] = tsig
-
-
-	ch <- Msg{m, nil}
-	in := <-ch
-	if in.Dns != nil {
-		if in.Dns.Rcode != dns.RcodeSuccess {
-			t.Log("Failed to get an valid answer")
-			t.Fail()
-		}
-		fmt.Printf("%v\n", in.Dns)
-	} else {
-		fmt.Printf("Failed to get a good anwer")
-	}
-	ch <- Msg{nil, nil}
-	<-ch // wait for ch to close channel
-}
diff --git a/resolver/resolver_test.go b/resolver/resolver_test.go
index f08d6526..daa6b7b2 100644
--- a/resolver/resolver_test.go
+++ b/resolver/resolver_test.go
@@ -6,7 +6,6 @@ import (
         "dns"
 )
 
-
 func TestResolver(t *testing.T) {
 	res := new(Resolver)
 	ch := res.NewQuerier()
@@ -44,3 +43,88 @@ func TestResolver(t *testing.T) {
 	ch <- Msg{nil, nil}
         <-ch
 }
+
+func TestResolverEdns(t *testing.T) {
+	res := new(Resolver)
+	ch := res.NewQuerier()
+
+	res.Servers = []string{"127.0.0.1"}
+	res.Timeout = 2
+	res.Attempts = 1
+
+	m := new(dns.Msg)
+	m.MsgHdr.RecursionDesired = true //only set this bit
+	m.Question = make([]dns.Question, 1)
+
+	// Add EDNS rr
+	edns := new(dns.RR_OPT)
+	edns.Hdr.Name = "." // must . be for edns
+	edns.Hdr.Rrtype = dns.TypeOPT
+	// You can handle an OTP RR as any other, but there
+	// are some convience functions
+	edns.SetUDPSize(2048)
+	edns.SetDo()
+	edns.Option = make([]dns.Option, 1)
+	edns.SetNsidToHex("") // Empty to request it
+
+	// ask something
+	m.Question[0] = dns.Question{"powerdns.nl", dns.TypeDNSKEY, dns.ClassINET}
+	m.Extra = make([]dns.RR, 1)
+	m.Extra[0] = edns
+
+	ch <- Msg{m, nil}
+	in := <-ch
+	if in.Dns != nil {
+		if in.Dns.Rcode != dns.RcodeSuccess {
+			t.Log("Failed to get an valid answer")
+			t.Fail()
+		}
+		fmt.Printf("%v\n", in.Dns)
+	} else {
+		fmt.Printf("Failed to get a good anwer")
+	}
+	ch <- Msg{nil, nil}
+	<-ch // wait for ch to close channel
+}
+
+func TestResolverTsig(t *testing.T) {
+	res := new(Resolver)
+	ch := res.NewQuerier()
+
+	res.Servers = []string{"127.0.0.1"}
+	res.Timeout = 2
+	res.Attempts = 1
+
+	m := new(dns.Msg)
+	m.MsgHdr.RecursionDesired = true //only set this bit
+	m.Question = make([]dns.Question, 1)
+
+	// ask something
+	m.Question[0] = dns.Question{"powerdns.nl", dns.TypeDNSKEY, dns.ClassINET}
+	m.Extra = make([]dns.RR, 1)
+        m.SetId()
+
+        tsig := new(dns.RR_TSIG)
+        tsig.Hdr.Name = "miek.nl"       // for tsig this is the key's name
+        tsig.Hdr.Rrtype = dns.TypeTSIG
+        tsig.Hdr.Class = dns.ClassANY
+        tsig.Hdr.Ttl = 0
+        tsig.Generate(m, "geheim")
+        // Add it to the msg
+        m.Extra[0] = tsig
+
+
+	ch <- Msg{m, nil}
+	in := <-ch
+	if in.Dns != nil {
+		if in.Dns.Rcode != dns.RcodeSuccess {
+			t.Log("Failed to get an valid answer")
+			t.Fail()
+		}
+		fmt.Printf("%v\n", in.Dns)
+	} else {
+		fmt.Printf("Failed to get a good anwer")
+	}
+	ch <- Msg{nil, nil}
+	<-ch // wait for ch to close channel
+}