diff --git a/client/connection_test.go b/client/connection_test.go
index 9b3bf63..c70732d 100644
--- a/client/connection_test.go
+++ b/client/connection_test.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"code.google.com/p/gomock/gomock"
 	"github.com/fluffle/goirc/state"
+	"github.com/golang/mock/gomock"
 	"strings"
 	"testing"
 	"time"
diff --git a/client/handlers_test.go b/client/handlers_test.go
index a601563..13d7bce 100644
--- a/client/handlers_test.go
+++ b/client/handlers_test.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"code.google.com/p/gomock/gomock"
 	"github.com/fluffle/goirc/state"
+	"github.com/golang/mock/gomock"
 	"testing"
 	"time"
 )
diff --git a/state/mock_tracker.go b/state/mock_tracker.go
index 1902230..aa594c4 100644
--- a/state/mock_tracker.go
+++ b/state/mock_tracker.go
@@ -4,7 +4,7 @@
 package state
 
 import (
-	gomock "code.google.com/p/gomock/gomock"
+	gomock "github.com/golang/mock/gomock"
 )
 
 // Mock of Tracker interface