diff --git a/.travis.yml b/.travis.yml
index 41e06f836..f8e0d652e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ services:
 
 go:
   - 1.4
-  - 1.6
   - 1.7
+  - 1.8
   - tip
 
 matrix:
@@ -18,5 +18,3 @@ matrix:
 install:
   - go get github.com/onsi/ginkgo
   - go get github.com/onsi/gomega
-  - mkdir -p $HOME/gopath/src/gopkg.in
-  - mv `pwd` $HOME/gopath/src/gopkg.in/redis.v5
diff --git a/bench_test.go b/bench_test.go
index 2b4d45c58..021dba96b 100644
--- a/bench_test.go
+++ b/bench_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 func benchmarkRedisClient(poolSize int) *redis.Client {
diff --git a/cluster.go b/cluster.go
index f2832a4b0..d6d4e8426 100644
--- a/cluster.go
+++ b/cluster.go
@@ -7,10 +7,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/hashtag"
-	"gopkg.in/redis.v5/internal/pool"
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/hashtag"
+	"github.com/go-redis/redis/internal/pool"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 var errClusterNoNodes = internal.RedisError("redis: cluster has no nodes")
diff --git a/cluster_test.go b/cluster_test.go
index 589ef9804..4a7c4c1e2 100644
--- a/cluster_test.go
+++ b/cluster_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5"
-	"gopkg.in/redis.v5/internal/hashtag"
+	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/internal/hashtag"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/command.go b/command.go
index e28eb7581..6ebb45c9c 100644
--- a/command.go
+++ b/command.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 var (
diff --git a/command_test.go b/command_test.go
index 216a7b0c7..920f14b7c 100644
--- a/command_test.go
+++ b/command_test.go
@@ -1,10 +1,10 @@
 package redis_test
 
 import (
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Cmd", func() {
diff --git a/commands.go b/commands.go
index 9fcfadcc1..d8e513228 100644
--- a/commands.go
+++ b/commands.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 func readTimeout(timeout time.Duration) time.Duration {
diff --git a/commands_test.go b/commands_test.go
index 29d6cb6c6..ec97c929e 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -9,7 +9,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 var _ = Describe("Commands", func() {
diff --git a/example_instrumentation_test.go b/example_instrumentation_test.go
index 009138ebd..08fba0bfd 100644
--- a/example_instrumentation_test.go
+++ b/example_instrumentation_test.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	redis "gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 func Example_instrumentation() {
diff --git a/example_test.go b/example_test.go
index 45be04395..3ecd0ba48 100644
--- a/example_test.go
+++ b/example_test.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 )
 
 var client *redis.Client
diff --git a/export_test.go b/export_test.go
index a366dceee..d043b0df8 100644
--- a/export_test.go
+++ b/export_test.go
@@ -3,7 +3,7 @@ package redis
 import (
 	"time"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 func (c *baseClient) Pool() pool.Pooler {
diff --git a/internal/pool/bench_test.go b/internal/pool/bench_test.go
index 9184fe742..610e12c7c 100644
--- a/internal/pool/bench_test.go
+++ b/internal/pool/bench_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 func benchmarkPoolGetPut(b *testing.B, poolSize int) {
diff --git a/internal/pool/conn.go b/internal/pool/conn.go
index 2a135ae97..8af51d9de 100644
--- a/internal/pool/conn.go
+++ b/internal/pool/conn.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 var noDeadline = time.Time{}
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
index 4033e58de..f89f9b3c8 100644
--- a/internal/pool/pool.go
+++ b/internal/pool/pool.go
@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 var (
diff --git a/internal/pool/pool_test.go b/internal/pool/pool_test.go
index f24f855f7..c2983dd06 100644
--- a/internal/pool/pool_test.go
+++ b/internal/pool/pool_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-redis/redis/internal/pool"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5/internal/pool"
 )
 
 var _ = Describe("ConnPool", func() {
diff --git a/internal/proto/reader.go b/internal/proto/reader.go
index e5dc95edb..2159cf639 100644
--- a/internal/proto/reader.go
+++ b/internal/proto/reader.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strconv"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 const bytesAllocLimit = 1024 * 1024 // 1mb
diff --git a/internal/proto/reader_test.go b/internal/proto/reader_test.go
index 63046464e..8d2d71be9 100644
--- a/internal/proto/reader_test.go
+++ b/internal/proto/reader_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/internal/proto/scan.go b/internal/proto/scan.go
index f3c75d903..a73a369d5 100644
--- a/internal/proto/scan.go
+++ b/internal/proto/scan.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/redis.v5/internal"
+	"github.com/go-redis/redis/internal"
 )
 
 func Scan(b []byte, v interface{}) error {
diff --git a/internal/proto/write_buffer_test.go b/internal/proto/write_buffer_test.go
index c4438e4a9..84799ff3b 100644
--- a/internal/proto/write_buffer_test.go
+++ b/internal/proto/write_buffer_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/iterator_test.go b/iterator_test.go
index 7200c14ba..954165cc6 100644
--- a/iterator_test.go
+++ b/iterator_test.go
@@ -3,10 +3,10 @@ package redis_test
 import (
 	"fmt"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("ScanIterator", func() {
diff --git a/main_test.go b/main_test.go
index e48dfc90f..7c5a6a969 100644
--- a/main_test.go
+++ b/main_test.go
@@ -12,10 +12,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 const (
@@ -95,7 +95,7 @@ var _ = AfterSuite(func() {
 
 func TestGinkgoSuite(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "gopkg.in/redis.v5")
+	RunSpecs(t, "go-redis")
 }
 
 //------------------------------------------------------------------------------
diff --git a/options.go b/options.go
index bab7d4d59..1edc963c9 100644
--- a/options.go
+++ b/options.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type Options struct {
diff --git a/parser.go b/parser.go
index bba6096af..ea73fb780 100644
--- a/parser.go
+++ b/parser.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 // Implements proto.MultiBulkParse
diff --git a/pipeline.go b/pipeline.go
index 13b29e1a6..9e3ba0e68 100644
--- a/pipeline.go
+++ b/pipeline.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"sync"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type pipelineExecer func([]Cmder) error
diff --git a/pipeline_test.go b/pipeline_test.go
index 14ba784c6..563bb66bd 100644
--- a/pipeline_test.go
+++ b/pipeline_test.go
@@ -1,7 +1,7 @@
 package redis_test
 
 import (
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/pool_test.go b/pool_test.go
index 683f7c81f..3cd5585b2 100644
--- a/pool_test.go
+++ b/pool_test.go
@@ -3,10 +3,10 @@ package redis_test
 import (
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("pool", func() {
diff --git a/pubsub.go b/pubsub.go
index f98566e89..29a682395 100644
--- a/pubsub.go
+++ b/pubsub.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 // PubSub implements Pub/Sub commands as described in
diff --git a/pubsub_test.go b/pubsub_test.go
index 22f313073..4c7484551 100644
--- a/pubsub_test.go
+++ b/pubsub_test.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/race_test.go b/race_test.go
index 34973fe12..4529cf496 100644
--- a/race_test.go
+++ b/race_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("races", func() {
diff --git a/redis.go b/redis.go
index 1ddd754c5..04c9a7b84 100644
--- a/redis.go
+++ b/redis.go
@@ -1,13 +1,13 @@
-package redis // import "gopkg.in/redis.v5"
+package redis
 
 import (
 	"fmt"
 	"log"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
-	"gopkg.in/redis.v5/internal/proto"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
+	"github.com/go-redis/redis/internal/proto"
 )
 
 // Redis nil reply, .e.g. when key does not exist.
diff --git a/redis_context.go b/redis_context.go
index bfa62bc5a..6ec811ca5 100644
--- a/redis_context.go
+++ b/redis_context.go
@@ -5,7 +5,7 @@ package redis
 import (
 	"context"
 
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type baseClient struct {
diff --git a/redis_no_context.go b/redis_no_context.go
index 78a5a637c..0752192f1 100644
--- a/redis_no_context.go
+++ b/redis_no_context.go
@@ -3,7 +3,7 @@
 package redis
 
 import (
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 type baseClient struct {
diff --git a/redis_test.go b/redis_test.go
index c7ee7be5e..3f47e91e8 100644
--- a/redis_test.go
+++ b/redis_test.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"gopkg.in/redis.v5"
+	"github.com/go-redis/redis"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/ring.go b/ring.go
index 6e5f62aef..961b77805 100644
--- a/ring.go
+++ b/ring.go
@@ -9,10 +9,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/consistenthash"
-	"gopkg.in/redis.v5/internal/hashtag"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/consistenthash"
+	"github.com/go-redis/redis/internal/hashtag"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 var errRingShardsDown = errors.New("redis: all ring shards are down")
diff --git a/ring_test.go b/ring_test.go
index 1c1ae691b..21adab2ba 100644
--- a/ring_test.go
+++ b/ring_test.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Redis Ring", func() {
diff --git a/sentinel.go b/sentinel.go
index b39d36534..8070b4642 100644
--- a/sentinel.go
+++ b/sentinel.go
@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 //------------------------------------------------------------------------------
diff --git a/sentinel_test.go b/sentinel_test.go
index d7038575f..04bbabd1e 100644
--- a/sentinel_test.go
+++ b/sentinel_test.go
@@ -1,10 +1,10 @@
 package redis_test
 
 import (
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Sentinel", func() {
diff --git a/tx.go b/tx.go
index 60d57cd2f..762bddc90 100644
--- a/tx.go
+++ b/tx.go
@@ -1,8 +1,8 @@
 package redis
 
 import (
-	"gopkg.in/redis.v5/internal"
-	"gopkg.in/redis.v5/internal/pool"
+	"github.com/go-redis/redis/internal"
+	"github.com/go-redis/redis/internal/pool"
 )
 
 // Redis transaction failed.
diff --git a/tx_test.go b/tx_test.go
index 5ca22fdf1..583ea0575 100644
--- a/tx_test.go
+++ b/tx_test.go
@@ -4,10 +4,10 @@ import (
 	"strconv"
 	"sync"
 
+	"github.com/go-redis/redis"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"gopkg.in/redis.v5"
 )
 
 var _ = Describe("Tx", func() {