diff --git a/bzz/chunker_test.go b/bzz/chunker_test.go
index 84b50c72f3..b7ddd47a58 100644
--- a/bzz/chunker_test.go
+++ b/bzz/chunker_test.go
@@ -2,7 +2,6 @@ package bzz
 
 import (
 	"bytes"
-	"crypto/rand"
 	"fmt"
 	"testing"
 	"time"
@@ -14,15 +13,6 @@ import (
 Tests TreeChunker by splitting and joining a random byte slice
 */
 
-func testDataReader(l int) (r *ChunkReader, slice []byte) {
-	slice = make([]byte, l)
-	if _, err := rand.Read(slice); err != nil {
-		panic("rand error")
-	}
-	r = NewChunkReaderFromBytes(slice)
-	return
-}
-
 type chunkerTester struct {
 	errors  []error
 	chunks  []*Chunk
diff --git a/bzz/common_test.go b/bzz/common_test.go
index 265143cbf2..b1931d5589 100644
--- a/bzz/common_test.go
+++ b/bzz/common_test.go
@@ -5,6 +5,15 @@ import (
 	"testing"
 )
 
+func testDataReader(l int) (r *ChunkReader, slice []byte) {
+	slice = make([]byte, l)
+	if _, err := rand.Read(slice); err != nil {
+		panic("rand error")
+	}
+	r = NewChunkReaderFromBytes(slice)
+	return
+}
+
 func randomChunks(l int64, branches int64, chunkC chan *Chunk) (key Key, errC chan error) {
 	chunker := &TreeChunker{
 		Branches: branches,
diff --git a/bzz/dpa_test.go b/bzz/dpa_test.go
index a6d45a6add..f4cf80563f 100644
--- a/bzz/dpa_test.go
+++ b/bzz/dpa_test.go
@@ -1,5 +1,5 @@
-// test bench for the package blockhash
-
 package bzz
 
-import ()
+import (
+// "github.com/ethereum/go-ethereum/bzz/test"
+)