diff --git a/go/vt/binlog/binlog_streamer_test.go b/go/vt/binlog/binlog_streamer_test.go
index 9a828a0996..e822504e9f 100644
--- a/go/vt/binlog/binlog_streamer_test.go
+++ b/go/vt/binlog/binlog_streamer_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/youtube/vitess/go/sync2"
 	"github.com/youtube/vitess/go/testfiles"
-	"github.com/youtube/vitess/go/vt/mysqlctl/proto"
+	"github.com/youtube/vitess/go/vt/binlog/proto"
 )
 
 func TestPosParse(t *testing.T) {
diff --git a/go/vt/binlog/event_streamer_test.go b/go/vt/binlog/event_streamer_test.go
index cc4125bcb1..ee9b75a734 100644
--- a/go/vt/binlog/event_streamer_test.go
+++ b/go/vt/binlog/event_streamer_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/youtube/vitess/go/vt/mysqlctl/proto"
+	"github.com/youtube/vitess/go/vt/binlog/proto"
 )
 
 type eventErrorCase struct {
diff --git a/go/vt/binlog/keyrange_filter_test.go b/go/vt/binlog/keyrange_filter_test.go
index 2e4e392655..33e2226a64 100644
--- a/go/vt/binlog/keyrange_filter_test.go
+++ b/go/vt/binlog/keyrange_filter_test.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/youtube/vitess/go/vt/binlog/proto"
 	"github.com/youtube/vitess/go/vt/key"
-	"github.com/youtube/vitess/go/vt/mysqlctl/proto"
 )
 
 var testKeyRange = key.KeyRange{
diff --git a/go/vt/binlog/mysqlbinlog_test.go b/go/vt/binlog/mysqlbinlog_test.go
index 908ec404a4..d7bc0fd892 100644
--- a/go/vt/binlog/mysqlbinlog_test.go
+++ b/go/vt/binlog/mysqlbinlog_test.go
@@ -112,7 +112,7 @@ func TestWarning(t *testing.T) {
 	ioutil.ReadAll(out)
 	mbl.Wait()
 	logutil.Flush()
-	warnbytes, err := ioutil.ReadFile(path.Join(os.TempDir(), "mysqlctl.test.WARNING"))
+	warnbytes, err := ioutil.ReadFile(path.Join(os.TempDir(), "binlog.test.WARNING"))
 	if err != nil {
 		t.Error(err)
 	}
@@ -135,7 +135,7 @@ func TestError(t *testing.T) {
 	ioutil.ReadAll(out)
 	mbl.Wait()
 	logutil.Flush()
-	warnbytes, err := ioutil.ReadFile(path.Join(os.TempDir(), "mysqlctl.test.ERROR"))
+	warnbytes, err := ioutil.ReadFile(path.Join(os.TempDir(), "binlog.test.ERROR"))
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/go/vt/binlog/tables_filter_test.go b/go/vt/binlog/tables_filter_test.go
index 08c1a90324..43d6ab2f8a 100644
--- a/go/vt/binlog/tables_filter_test.go
+++ b/go/vt/binlog/tables_filter_test.go
@@ -5,11 +5,9 @@
 package binlog
 
 import (
-	//"fmt"
 	"testing"
 
-	//	"github.com/youtube/vitess/go/vt/key"
-	"github.com/youtube/vitess/go/vt/mysqlctl/proto"
+	"github.com/youtube/vitess/go/vt/binlog/proto"
 )
 
 var testTables = []string{