diff --git a/bolt/variable_test.go b/bolt/variable_test.go
deleted file mode 100644
index f8e1e15b79d..00000000000
--- a/bolt/variable_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package bolt_test
-
-import (
-	"context"
-	platform "github.com/influxdata/influxdb"
-	"github.com/influxdata/influxdb/bolt"
-	"github.com/influxdata/influxdb/inmem"
-	platformtesting "github.com/influxdata/influxdb/testing"
-	"testing"
-)
-
-func initVariableService(f platformtesting.VariableFields, t *testing.T) (platform.VariableService, string, func()) {
-	c := inmem.NewService()
-
-	if f.TimeGenerator == nil {
-		c.TimeGenerator = platform.RealTimeGenerator{}
-	}
-	c.IDGenerator = f.IDGenerator
-	c.TimeGenerator = f.TimeGenerator
-	if f.TimeGenerator == nil {
-		c.TimeGenerator = platform.RealTimeGenerator{}
-	}
-
-	ctx := context.Background()
-	for _, variable := range f.Variables {
-		if err := c.ReplaceVariable(ctx, variable); err != nil {
-			t.Fatalf("failed to populate test variables: %v", err)
-		}
-	}
-
-	done := func() {
-		for _, variable := range f.Variables {
-			if err := c.DeleteVariable(ctx, variable.ID); err != nil {
-				t.Fatalf("failed to clean up variables bolt test: %v", err)
-			}
-		}
-	}
-
-	return c, bolt.OpPrefix, done
-}
-
-func TestVariableService(t *testing.T) {
-	t.Parallel()
-	platformtesting.VariableService(initVariableService, t)
-}
diff --git a/http/variable_test.go b/http/variable_test.go
index 3e6a03952d0..c8dbdd79513 100644
--- a/http/variable_test.go
+++ b/http/variable_test.go
@@ -14,7 +14,6 @@ import (
 	"go.uber.org/zap"
 
 	platform "github.com/influxdata/influxdb"
-	"github.com/influxdata/influxdb/inmem"
 	"github.com/influxdata/influxdb/mock"
 	platformtesting "github.com/influxdata/influxdb/testing"
 	"github.com/julienschmidt/httprouter"
@@ -887,37 +886,3 @@ func TestService_handlePostVariableLabel(t *testing.T) {
 		})
 	}
 }
-
-func initVariableService(f platformtesting.VariableFields, t *testing.T) (platform.VariableService, string, func()) {
-	t.Helper()
-
-	svc := inmem.NewService()
-	svc.IDGenerator = f.IDGenerator
-	svc.TimeGenerator = f.TimeGenerator
-	if f.TimeGenerator == nil {
-		svc.TimeGenerator = platform.RealTimeGenerator{}
-	}
-
-	ctx := context.Background()
-	for _, variable := range f.Variables {
-		if err := svc.ReplaceVariable(ctx, variable); err != nil {
-			t.Fatalf("failed to populate variables")
-		}
-	}
-
-	variableBackend := NewMockVariableBackend()
-	variableBackend.HTTPErrorHandler = ErrorHandler(0)
-	variableBackend.VariableService = svc
-	handler := NewVariableHandler(variableBackend)
-	server := httptest.NewServer(handler)
-	client := VariableService{
-		Addr: server.URL,
-	}
-	done := server.Close
-
-	return &client, inmem.OpPrefix, done
-}
-
-func TestVariableService(t *testing.T) {
-	platformtesting.VariableService(initVariableService, t)
-}
diff --git a/inmem/variable_test.go b/inmem/variable_test.go
deleted file mode 100644
index 86897c8913d..00000000000
--- a/inmem/variable_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package inmem
-
-import (
-	"context"
-	"testing"
-
-	platform "github.com/influxdata/influxdb"
-	platformtesting "github.com/influxdata/influxdb/testing"
-)
-
-func initVariableService(f platformtesting.VariableFields, t *testing.T) (platform.VariableService, string, func()) {
-	s := NewService()
-	s.IDGenerator = f.IDGenerator
-	s.TimeGenerator = f.TimeGenerator
-
-	ctx := context.TODO()
-	for _, variable := range f.Variables {
-		if err := s.ReplaceVariable(ctx, variable); err != nil {
-			t.Fatalf("failed to populate variables")
-		}
-	}
-
-	done := func() {
-		for _, variable := range f.Variables {
-			if err := s.DeleteVariable(ctx, variable.ID); err != nil {
-				t.Fatalf("failed to clean up variables bolt test: %v", err)
-			}
-		}
-	}
-	return s, OpPrefix, done
-}
-
-func TestVariableService(t *testing.T) {
-	platformtesting.VariableService(initVariableService, t)
-}
diff --git a/testing/variable.go b/testing/variable.go
index 32f2fb13565..4d130cb2ab3 100644
--- a/testing/variable.go
+++ b/testing/variable.go
@@ -228,7 +228,7 @@ func CreateVariable(init func(VariableFields, *testing.T) (platform.VariableServ
 				Variables: []*platform.Variable{
 					{
 						ID:             MustIDBase16(idB),
-						OrganizationID: platform.ID(3),
+						OrganizationID: MustIDBase16(idD),
 						Name:           "existing-variable",
 						Selected:       []string{"b"},
 						Arguments: &platform.VariableArguments{
@@ -241,7 +241,7 @@ func CreateVariable(init func(VariableFields, *testing.T) (platform.VariableServ
 			args: args{
 				variable: &platform.Variable{
 					ID:             MustIDBase16(idA),
-					OrganizationID: platform.ID(3),
+					OrganizationID: MustIDBase16(idD),
 					Name:           "existing-variable",
 					Selected:       []string{"a"},
 					Arguments: &platform.VariableArguments{
@@ -262,7 +262,7 @@ func CreateVariable(init func(VariableFields, *testing.T) (platform.VariableServ
 				variables: []*platform.Variable{
 					{
 						ID:             MustIDBase16(idB),
-						OrganizationID: platform.ID(3),
+						OrganizationID: MustIDBase16(idD),
 						Name:           "existing-variable",
 						Selected:       []string{"b"},
 						Arguments: &platform.VariableArguments{