diff --git a/src/go/pt-mongodb-query-profiler/main.go b/src/go/pt-mongodb-query-profiler/main.go
index 7a8b3626..429fe21d 100644
--- a/src/go/pt-mongodb-query-profiler/main.go
+++ b/src/go/pt-mongodb-query-profiler/main.go
@@ -13,7 +13,7 @@ import (
 	"github.com/howeyc/gopass"
 	"github.com/montanaflynn/stats"
 	"github.com/pborman/getopt"
-	"github.com/percona/toolkit-go/mongolib/proto"
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )
diff --git a/src/go/pt-mongodb-query-profiler/main_test.go b/src/go/pt-mongodb-query-profiler/main_test.go
index 26e3ee34..bcaf0c27 100644
--- a/src/go/pt-mongodb-query-profiler/main_test.go
+++ b/src/go/pt-mongodb-query-profiler/main_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/percona/toolkit-go/mongolib/proto"
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
 
-	"gopkg.in/mgo.v2/dbtest" // mock
+	"gopkg.in/mgo.v2/dbtest"
 )
 
 var Server dbtest.DBServer
diff --git a/src/go/pt-mongodb-summary/main.go b/src/go/pt-mongodb-summary/main.go
index 6ed6e285..591711b0 100644
--- a/src/go/pt-mongodb-summary/main.go
+++ b/src/go/pt-mongodb-summary/main.go
@@ -10,9 +10,9 @@ import (
 
 	"github.com/howeyc/gopass"
 	"github.com/pborman/getopt"
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
+	"github.com/percona/percona-toolkit/src/go/pt-mongodb-summary/templates"
 	"github.com/percona/pmgo"
-	"github.com/percona/toolkit-go/mongolib/proto"
-	"github.com/percona/toolkit-go/pt-mongodb-summary/templates"
 	"github.com/pkg/errors"
 	"github.com/shirou/gopsutil/process"
 	"gopkg.in/mgo.v2"
diff --git a/src/go/pt-mongodb-summary/main_test.go b/src/go/pt-mongodb-summary/main_test.go
index 53d89ca2..4b21870f 100644
--- a/src/go/pt-mongodb-summary/main_test.go
+++ b/src/go/pt-mongodb-summary/main_test.go
@@ -10,9 +10,9 @@ import (
 	"gopkg.in/mgo.v2/bson"
 
 	"github.com/golang/mock/gomock"
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
 	"github.com/percona/pmgo/pmgomock"
-	"github.com/percona/toolkit-go/mongolib/proto"
-	"github.com/percona/toolkit-go/pt-mongodb-summary/test"
+	"github.com/percona/toolkit-go-old/pt-mongodb-summary/test"
 )
 
 func TestGetOpCounterStats(t *testing.T) {
diff --git a/src/go/pt-mongodb-summary/oplog.go b/src/go/pt-mongodb-summary/oplog.go
index 11a528c0..62104e54 100644
--- a/src/go/pt-mongodb-summary/oplog.go
+++ b/src/go/pt-mongodb-summary/oplog.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/percona/toolkit-go/mongolib/proto"
+	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
 	"github.com/pkg/errors"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
diff --git a/src/go/pt-mongodb-summary/test/util.go b/src/go/pt-mongodb-summary/test/util.go
deleted file mode 100644
index 0d7d46fb..00000000
--- a/src/go/pt-mongodb-summary/test/util.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package test
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-func RootDir() (string, error) {
-	out, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
-	if err != nil {
-		rootdir, err := searchDir()
-		if err != nil {
-			return "", err
-		}
-		return rootdir, nil
-	}
-	return strings.Replace(string(out), "\n", "", -1), nil
-}
-
-func searchDir() (string, error) {
-
-	rootdir := ""
-	dir, err := os.Getwd()
-	if err != nil {
-		return "", err
-	}
-
-	for i := 0; i < 3; i++ {
-		if FileExists(dir + "/.git") {
-			rootdir = filepath.Clean(dir + "test")
-			break
-		}
-		dir = dir + "/.."
-	}
-	if rootdir == "" {
-		return "", fmt.Errorf("cannot detect root dir")
-	}
-	return rootdir, nil
-}
-
-func FileExists(file string) bool {
-	_, err := os.Lstat(file)
-	if err == nil {
-		return true
-	}
-	if os.IsNotExist(err) {
-		return false
-	}
-	return true
-}
-
-func LoadJson(filename string, destination interface{}) error {
-	dat, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return err
-	}
-
-	err = json.Unmarshal(dat, &destination)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}