diff --git a/pipeline.go b/pipeline.go
index de99f124..b66c0597 100644
--- a/pipeline.go
+++ b/pipeline.go
@@ -1,7 +1,6 @@
 package redis
 
 import (
-	"errors"
 	"sync"
 
 	"github.com/go-redis/redis/internal/pool"
@@ -80,7 +79,7 @@ func (c *Pipeline) Exec() ([]Cmder, error) {
 	}
 
 	if len(c.cmds) == 0 {
-		return nil, errors.New("redis: pipeline is empty")
+		return nil, nil
 	}
 
 	cmds := c.cmds
diff --git a/pipeline_test.go b/pipeline_test.go
index 3f69e0c7..5dc5f94a 100644
--- a/pipeline_test.go
+++ b/pipeline_test.go
@@ -34,16 +34,17 @@ var _ = Describe("pipelining", func() {
 	})
 
 	assertPipeline := func() {
-		It("returns an error when there are no commands", func() {
+		It("returns no errors when there are no commands", func() {
 			_, err := pipe.Exec()
-			Expect(err).To(MatchError("redis: pipeline is empty"))
+			Expect(err).NotTo(HaveOccurred())
 		})
 
 		It("discards queued commands", func() {
 			pipe.Get("key")
 			pipe.Discard()
-			_, err := pipe.Exec()
-			Expect(err).To(MatchError("redis: pipeline is empty"))
+			cmds, err := pipe.Exec()
+			Expect(err).NotTo(HaveOccurred())
+			Expect(cmds).To(BeNil())
 		})
 
 		It("handles val/err", func() {
diff --git a/redis_test.go b/redis_test.go
index 79d727a0..972b67be 100644
--- a/redis_test.go
+++ b/redis_test.go
@@ -344,6 +344,7 @@ var _ = Describe("Client OnConnect", func() {
 
 	BeforeEach(func() {
 		opt := redisOptions()
+		opt.DB = 0
 		opt.OnConnect = func(cn *redis.Conn) error {
 			return cn.ClientSetName("on_connect").Err()
 		}
diff --git a/tx_test.go b/tx_test.go
index 83b12e1f..8d9cc036 100644
--- a/tx_test.go
+++ b/tx_test.go
@@ -86,12 +86,12 @@ var _ = Describe("Tx", func() {
 		Expect(get.Val()).To(Equal("hello2"))
 	})
 
-	It("returns an error when there are no commands", func() {
+	It("returns no error when there are no commands", func() {
 		err := client.Watch(func(tx *redis.Tx) error {
 			_, err := tx.Pipelined(func(redis.Pipeliner) error { return nil })
 			return err
 		})
-		Expect(err).To(MatchError("redis: pipeline is empty"))
+		Expect(err).NotTo(HaveOccurred())
 
 		v, err := client.Ping().Result()
 		Expect(err).NotTo(HaveOccurred())