diff --git a/cmd/influxd/run/backup_restore_test.go b/cmd/influxd/run/backup_restore_test.go
index 26c3012d9d..78c9e26891 100644
--- a/cmd/influxd/run/backup_restore_test.go
+++ b/cmd/influxd/run/backup_restore_test.go
@@ -35,7 +35,7 @@ func TestServer_BackupAndRestore(t *testing.T) {
 		if err := s.CreateDatabaseAndRetentionPolicy(db, newRetentionPolicyInfo(rp, 1, 0)); err != nil {
 			t.Fatal(err)
 		}
-		if err := s.MetaStore.SetDefaultRetentionPolicy(db, rp); err != nil {
+		if err := s.MetaClient.SetDefaultRetentionPolicy(db, rp); err != nil {
 			t.Fatal(err)
 		}
 
diff --git a/services/continuous_querier/service_test.go b/services/continuous_querier/service_test.go
index 93577a57e9..2ecac123e1 100644
--- a/services/continuous_querier/service_test.go
+++ b/services/continuous_querier/service_test.go
@@ -95,12 +95,12 @@ func TestContinuousQueryService_Run(t *testing.T) {
 
 func TestContinuousQueryService_ResampleOptions(t *testing.T) {
 	s := NewTestService(t)
-	ms := NewMetaStore(t)
-	ms.CreateDatabase("db", "")
-	ms.CreateContinuousQuery("db", "cq", `CREATE CONTINUOUS QUERY cq ON db RESAMPLE EVERY 10s FOR 2m BEGIN SELECT mean(value) INTO cpu_mean FROM cpu GROUP BY time(1m) END`)
-	s.MetaStore = ms
+	mc := NewMetaClient(t)
+	mc.CreateDatabase("db", "")
+	mc.CreateContinuousQuery("db", "cq", `CREATE CONTINUOUS QUERY cq ON db RESAMPLE EVERY 10s FOR 2m BEGIN SELECT mean(value) INTO cpu_mean FROM cpu GROUP BY time(1m) END`)
+	s.MetaClient = mc
 
-	db, err := s.MetaStore.Database("db")
+	db, err := s.MetaClient.Database("db")
 	if err != nil {
 		t.Fatal(err)
 	}