diff --git a/Makefile b/Makefile
index 759c5cc09..a2e3bea7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PACKAGES=$(shell go list ./...)
+PACKAGES=$(shell go list ./... | grep -v "test")
 
 all: get_deps test
 
diff --git a/test/main.go b/test/main.go
index 28de2be88..670e3deae 100644
--- a/test/main.go
+++ b/test/main.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
+	rpcserver "../server"
 	cmn "github.com/tendermint/go-common"
-	rpcserver "github.com/tendermint/go-rpc/server"
 )
 
 var routes = map[string]*rpcserver.RPCFunc{