diff --git a/util/testutil/node.go b/core/mock.go
similarity index 87%
rename from util/testutil/node.go
rename to core/mock.go
index 8df1bb2cd..caaa0c075 100644
--- a/util/testutil/node.go
+++ b/core/mock.go
@@ -1,10 +1,9 @@
-package testutil
+package core
 
 import (
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
 	syncds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/sync"
 	bs "github.com/jbenet/go-ipfs/blockservice"
-	core "github.com/jbenet/go-ipfs/core"
 	ci "github.com/jbenet/go-ipfs/crypto"
 	mdag "github.com/jbenet/go-ipfs/merkledag"
 	nsys "github.com/jbenet/go-ipfs/namesys"
@@ -12,10 +11,8 @@ import (
 	mdht "github.com/jbenet/go-ipfs/routing/mock"
 )
 
-var _ = core.IpfsNode{}
-
-func NewMockNode() (*core.IpfsNode, error) {
-	nd := new(core.IpfsNode)
+func NewMockNode() (*IpfsNode, error) {
+	nd := new(IpfsNode)
 
 	//Generate Identity
 	nd.Identity = &peer.Peer{ID: []byte("TESTING")}
diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go
index 330cde546..e452753e8 100644
--- a/fuse/ipns/ipns_test.go
+++ b/fuse/ipns/ipns_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	fstest "github.com/jbenet/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	testutil "github.com/jbenet/go-ipfs/util/testutil"
+	"github.com/jbenet/go-ipfs/core"
 )
 
 func randBytes(size int) []byte {
@@ -18,7 +18,7 @@ func randBytes(size int) []byte {
 }
 
 func TestIpnsBasicIO(t *testing.T) {
-	localnode, err := testutil.NewMockNode()
+	localnode, err := core.NewMockNode()
 	if err != nil {
 		t.Fatal(err)
 	}