diff --git a/bench/bench.go b/bench/bench.go
index 0b44dea20..bd30f9e5f 100644
--- a/bench/bench.go
+++ b/bench/bench.go
@@ -11,6 +11,7 @@ import (
 
 	"time"
 
+	"context"
 	"github.com/umbel/pilosa"
 	"math/rand"
 )
@@ -111,7 +112,7 @@ func (b *DiagonalSetBits) Run(agentNum int) map[string]interface{} {
 	for n := 0; n < b.Iterations; n++ {
 		iterID := agentizeNum(n, b.Iterations, agentNum)
 		query := fmt.Sprintf("SetBit(%d, 'frame.n', %d)", b.BaseBitmapID+iterID, b.BaseProfileID+iterID)
-		b.cli.ExecuteQuery(b.DB, query, true)
+		b.cli.ExecuteQuery(context.TODO(), b.DB, query, true)
 	}
 	return results
 }
@@ -175,7 +176,7 @@ func (b *MultiDBSetBits) Run(agentNum int) map[string]interface{} {
 	}
 	for n := 0; n < b.Iterations; n++ {
 		query := fmt.Sprintf("SetBit(%d, 'frame.n', %d)", b.BaseBitmapID+n, b.BaseProfileID+n)
-		b.cli.ExecuteQuery("multidb"+strconv.Itoa(agentNum), query, true)
+		b.cli.ExecuteQuery(context.TODO(), "multidb"+strconv.Itoa(agentNum), query, true)
 	}
 	return results
 }
@@ -266,7 +267,7 @@ func (b *RandomSetBits) Run(agentNum int) map[string]interface{} {
 		bitmapID := rng.Int63n(b.BitmapIDRange)
 		profID := rng.Int63n(b.ProfileIDRange)
 		query := fmt.Sprintf("SetBit(%d, 'frame.n', %d)", b.BaseBitmapID+bitmapID, b.BaseProfileID+profID)
-		b.cli.ExecuteQuery(b.DB, query, true)
+		b.cli.ExecuteQuery(context.TODO(), b.DB, query, true)
 	}
 	return results
 }
diff --git a/cmd/pilosa/main_test.go b/cmd/pilosa/main_test.go
index 0eaabd96d..20d2e8e64 100644
--- a/cmd/pilosa/main_test.go
+++ b/cmd/pilosa/main_test.go
@@ -2,8 +2,8 @@ package main_test
 
 import (
 	"bytes"
-	"encoding/json"
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -16,6 +16,7 @@ import (
 	"testing"
 	"testing/quick"
 
+	"context"
 	"github.com/BurntSushi/toml"
 	"github.com/pilosa/pilosa"
 	main "github.com/pilosa/pilosa/cmd/pilosa"
diff --git a/cmd/pilosactl/main.go b/cmd/pilosactl/main.go
index 4d4c6f813..dbb06dbd6 100644
--- a/cmd/pilosactl/main.go
+++ b/cmd/pilosactl/main.go
@@ -23,6 +23,7 @@ import (
 	"time"
 	"unsafe"
 
+	"context"
 	"encoding/json"
 	"github.com/umbel/pilosa"
 	"github.com/umbel/pilosa/bench"