diff --git a/bolt/variable_test.go b/bolt/variable_test.go
index af17bd79ed..56394a8833 100644
--- a/bolt/variable_test.go
+++ b/bolt/variable_test.go
@@ -5,13 +5,13 @@ import (
 	platform "github.com/influxdata/influxdb"
 	"github.com/influxdata/influxdb/bolt"
 	"github.com/influxdata/influxdb/inmem"
-	"github.com/influxdata/influxdb/kv"
 	platformtesting "github.com/influxdata/influxdb/testing"
 	"testing"
 )
 
 func initVariableService(f platformtesting.VariableFields, t *testing.T) (platform.VariableService, string, func()) {
-	c := kv.NewService(inmem.NewKVStore())
+	//c := kv.NewService(inmem.NewKVStore())
+	c := inmem.NewService()
 
 	if f.TimeGenerator == nil {
 		c.TimeGenerator = platform.RealTimeGenerator{}
diff --git a/http/variable_test.go b/http/variable_test.go
index 066882b360..9715310eed 100644
--- a/http/variable_test.go
+++ b/http/variable_test.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/influxdata/influxdb/kv"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -886,7 +885,7 @@ func TestService_handlePostVariableLabel(t *testing.T) {
 func initVariableService(f platformtesting.VariableFields, t *testing.T) (platform.VariableService, string, func()) {
 	t.Helper()
 
-	svc := kv.NewService(inmem.NewKVStore())
+	svc := inmem.NewService()
 	svc.IDGenerator = f.IDGenerator
 	svc.TimeGenerator = f.TimeGenerator
 	if f.TimeGenerator == nil {