diff --git a/Makefile b/Makefile
index 487c3e304..d732e5ae1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ default: test build
 
 .PHONY: prepare
 prepare:
-	go get github.com/kardianos/govendor
+	go get -u github.com/kardianos/govendor
 	govendor sync
 
 .PHONY: lint
diff --git a/cmd/api/main.go b/cmd/api/main.go
index 13b0e245f..8b5f3dfa3 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -78,7 +78,7 @@ func main() {
 	}
 
 	databaseSettings := config.Redis.GetSettings()
-	database := redis.NewDatabase(logger, databaseSettings)
+	database := redis.NewDatabase(logger, databaseSettings, redis.API)
 
 	graphiteSettings := config.Graphite.GetSettings()
 	if err = metrics.Init(graphiteSettings, serviceName); err != nil {
diff --git a/cmd/checker/main.go b/cmd/checker/main.go
index 6e3057c3d..cb77e0a2c 100644
--- a/cmd/checker/main.go
+++ b/cmd/checker/main.go
@@ -74,7 +74,7 @@ func main() {
 	}
 
 	databaseSettings := config.Redis.GetSettings()
-	database := redis.NewDatabase(logger, databaseSettings)
+	database := redis.NewDatabase(logger, databaseSettings, redis.Checker)
 
 	remoteSettings := config.Remote.GetSettings()
 	checkerMetrics := metrics.ConfigureCheckerMetrics(serviceName, remoteSettings.IsEnabled())
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
index 171dd1b8a..20ed341ba 100644
--- a/cmd/cli/main.go
+++ b/cmd/cli/main.go
@@ -117,7 +117,7 @@ func initApp() (moira.Logger, moira.Database) {
 	}
 
 	databaseSettings := config.Redis.GetSettings()
-	dataBase := redis.NewDatabase(logger, databaseSettings)
+	dataBase := redis.NewDatabase(logger, databaseSettings, redis.Cli)
 	return logger, dataBase
 }
 
diff --git a/cmd/filter/main.go b/cmd/filter/main.go
index 915a793d3..7891716a7 100644
--- a/cmd/filter/main.go
+++ b/cmd/filter/main.go
@@ -82,7 +82,7 @@ func main() {
 		logger.Error(err)
 	}
 
-	database := redis.NewDatabase(logger, config.Redis.GetSettings())
+	database := redis.NewDatabase(logger, config.Redis.GetSettings(), redis.Filter)
 
 	retentionConfigFile, err := os.Open(config.Filter.RetentionConfig)
 	if err != nil {
diff --git a/cmd/notifier/main.go b/cmd/notifier/main.go
index bcb2467f2..3b61b180b 100644
--- a/cmd/notifier/main.go
+++ b/cmd/notifier/main.go
@@ -78,7 +78,7 @@ func main() {
 	}
 
 	databaseSettings := config.Redis.GetSettings()
-	database := redis.NewDatabase(logger, databaseSettings)
+	database := redis.NewDatabase(logger, databaseSettings, redis.Notifier)
 
 	// configure carbon-api functions
 	functions.New(make(map[string]string))
diff --git a/database/redis/bot_test.go b/database/redis/bot_test.go
index 3237f45c0..4ebe18b91 100644
--- a/database/redis/bot_test.go
+++ b/database/redis/bot_test.go
@@ -6,14 +6,15 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 
 	"fmt"
+	"time"
+
 	"github.com/moira-alert/moira/database"
 	"github.com/moira-alert/moira/logging/go-logging"
-	"time"
 )
 
 //func TestRenewBot(t *testing.T) {
 //	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-//	dataBase := NewDatabase(logger, config)
+//	dataBase := newTestDatabase(logger, config)
 //	dataBase.flush()
 //	//defer dataBase.flush()
 //
@@ -65,7 +66,7 @@ import (
 
 func TestBotDataStoring(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -212,7 +213,7 @@ func TestBotDataStoring(t *testing.T) {
 
 func TestBotDataStoringErrorConnection(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/contact_test.go b/database/redis/contact_test.go
index d84abea09..0d321c1da 100644
--- a/database/redis/contact_test.go
+++ b/database/redis/contact_test.go
@@ -16,10 +16,16 @@ var user2 = "user2"
 
 var config = Config{Port: "6379", Host: "localhost"}
 var emptyConfig = Config{}
+var testSource = DBSource("test")
+
+// use it only for tests
+func newTestDatabase(logger moira.Logger, config Config) *DbConnector {
+	return NewDatabase(logger, config, testSource)
+}
 
 func TestContacts(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -268,7 +274,7 @@ func TestContacts(t *testing.T) {
 
 func TestErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 
diff --git a/database/redis/database.go b/database/redis/database.go
index 07755aa15..b4c3c61ae 100644
--- a/database/redis/database.go
+++ b/database/redis/database.go
@@ -26,6 +26,18 @@ const (
 	receiveErrorSleepDuration = time.Second
 )
 
+// DBSource is type for describing who create database instance
+type DBSource string
+
+// All types of database instances users
+const (
+	API      DBSource = "API"
+	Checker  DBSource = "Checker"
+	Filter   DBSource = "Filter"
+	Notifier DBSource = "Notifier"
+	Cli      DBSource = "Cli"
+)
+
 // DbConnector contains redis pool
 type DbConnector struct {
 	pool                 *redis.Pool
@@ -36,10 +48,11 @@ type DbConnector struct {
 	servicesCache        *cache.Cache
 	messengersCache      *cache.Cache
 	sync                 *redsync.Redsync
+	source               DBSource
 }
 
 // NewDatabase creates Redis pool based on config
-func NewDatabase(logger moira.Logger, config Config) *DbConnector {
+func NewDatabase(logger moira.Logger, config Config, source DBSource) *DbConnector {
 	pool := newRedisPool(logger, config)
 	return &DbConnector{
 		pool:                 pool,
@@ -50,6 +63,7 @@ func NewDatabase(logger moira.Logger, config Config) *DbConnector {
 		servicesCache:        cache.New(cacheValueExpirationDuration, cacheCleanupInterval),
 		messengersCache:      cache.New(cache.NoExpiration, cache.DefaultExpiration),
 		sync:                 redsync.New([]redsync.Pool{pool}),
+		source:               source,
 	}
 }
 
diff --git a/database/redis/database_test.go b/database/redis/database_test.go
index 6875f911f..cbe2c7600 100644
--- a/database/redis/database_test.go
+++ b/database/redis/database_test.go
@@ -11,7 +11,7 @@ import (
 func TestInitialization(t *testing.T) {
 	Convey("Initialization methods", t, func() {
 		logger, _ := logging.ConfigureLog("stdout", "info", "test")
-		database := NewDatabase(logger, emptyConfig)
+		database := newTestDatabase(logger, emptyConfig)
 		So(database, ShouldNotBeEmpty)
 		_, err := database.pool.Dial()
 		So(err, ShouldNotBeNil)
diff --git a/database/redis/last_check.go b/database/redis/last_check.go
index 7676d8245..ca02cb90c 100644
--- a/database/redis/last_check.go
+++ b/database/redis/last_check.go
@@ -21,13 +21,7 @@ func (connector *DbConnector) GetTriggerLastCheck(triggerID string) (moira.Check
 
 // SetTriggerLastCheck sets trigger last check data
 func (connector *DbConnector) SetTriggerLastCheck(triggerID string, checkData *moira.CheckData, isRemote bool) error {
-	if isRemote {
-		return connector.setTriggerLastCheckAndUpdateProperCounter(triggerID, checkData, selfStateRemoteChecksCounterKey)
-	}
-	return connector.setTriggerLastCheckAndUpdateProperCounter(triggerID, checkData, selfStateChecksCounterKey)
-}
-
-func (connector *DbConnector) setTriggerLastCheckAndUpdateProperCounter(triggerID string, checkData *moira.CheckData, selfStateCheckCountKey string) error {
+	selfStateCheckCountKey := connector.getSelfStateCheckCountKey(isRemote)
 	bytes, err := json.Marshal(checkData)
 	if err != nil {
 		return err
@@ -40,7 +34,9 @@ func (connector *DbConnector) setTriggerLastCheckAndUpdateProperCounter(triggerI
 	c.Send("MULTI")
 	c.Send("SET", metricLastCheckKey(triggerID), bytes)
 	c.Send("ZADD", triggersChecksKey, checkData.Score, triggerID)
-	c.Send("INCR", selfStateCheckCountKey)
+	if selfStateCheckCountKey != "" {
+		c.Send("INCR", selfStateCheckCountKey)
+	}
 	if checkData.Score > 0 {
 		c.Send("SADD", badStateTriggersKey, triggerID)
 	} else {
@@ -56,6 +52,16 @@ func (connector *DbConnector) setTriggerLastCheckAndUpdateProperCounter(triggerI
 	return nil
 }
 
+func (connector *DbConnector) getSelfStateCheckCountKey(isRemote bool) string {
+	if connector.source != Checker {
+		return ""
+	}
+	if isRemote {
+		return selfStateRemoteChecksCounterKey
+	}
+	return selfStateChecksCounterKey
+}
+
 // RemoveTriggerLastCheck removes trigger last check data
 func (connector *DbConnector) RemoveTriggerLastCheck(triggerID string) error {
 	c := connector.pool.Get()
diff --git a/database/redis/last_check_test.go b/database/redis/last_check_test.go
index 9d76a724b..bb4be4927 100644
--- a/database/redis/last_check_test.go
+++ b/database/redis/last_check_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestLastCheck(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 	var triggerMaintenanceTS int64
@@ -286,7 +286,7 @@ func TestLastCheck(t *testing.T) {
 
 func TestRemoteLastCheck(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -392,7 +392,7 @@ func TestRemoteLastCheck(t *testing.T) {
 
 func TestLastCheckErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/lock_test.go b/database/redis/lock_test.go
index 64d47c7e0..a66cefbab 100644
--- a/database/redis/lock_test.go
+++ b/database/redis/lock_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestLock(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Test lock manipulation", t, func() {
@@ -45,7 +45,7 @@ func TestLock(t *testing.T) {
 
 func TestLockErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/metric_test.go b/database/redis/metric_test.go
index ff1e64f68..bf6bc0bbd 100644
--- a/database/redis/metric_test.go
+++ b/database/redis/metric_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestMetricsStoring(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	metric1 := "my.test.super.metric"
 	metric2 := "my.test.super.metric2"
@@ -185,7 +185,7 @@ func TestMetricsStoring(t *testing.T) {
 
 func TestRemoveMetricValues(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.metricsCache = cache.New(time.Second*2, time.Minute*60)
 	dataBase.flush()
 	defer dataBase.flush()
@@ -337,7 +337,7 @@ func TestRemoveMetricValues(t *testing.T) {
 
 func TestMetricSubscription(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 	metric1 := "my.test.super.metric"
@@ -402,7 +402,7 @@ func TestMetricSubscription(t *testing.T) {
 
 func TestMetricsStoringErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/nodata_checker_test.go b/database/redis/nodata_checker_test.go
index 1ba093be1..dab182a04 100644
--- a/database/redis/nodata_checker_test.go
+++ b/database/redis/nodata_checker_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestRenewNodataCheckerRegistration(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
diff --git a/database/redis/notification_event_test.go b/database/redis/notification_event_test.go
index 6e50a190e..33cd5dbb4 100644
--- a/database/redis/notification_event_test.go
+++ b/database/redis/notification_event_test.go
@@ -7,14 +7,15 @@ import (
 	"github.com/satori/go.uuid"
 	. "github.com/smartystreets/goconvey/convey"
 
+	"time"
+
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/database"
-	"time"
 )
 
 func TestNotificationEvents(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -173,7 +174,7 @@ func TestNotificationEvents(t *testing.T) {
 
 func TestNotificationEventErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 
diff --git a/database/redis/notification_test.go b/database/redis/notification_test.go
index 886df8ca3..df8c2f4da 100644
--- a/database/redis/notification_test.go
+++ b/database/redis/notification_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestScheduledNotification(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -172,7 +172,7 @@ func addNotifications(dataBase moira.Database, notifications []moira.ScheduledNo
 
 func TestScheduledNotificationErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 
diff --git a/database/redis/remote_triggers_to_check_test.go b/database/redis/remote_triggers_to_check_test.go
index f3737b3a1..12bc418cc 100644
--- a/database/redis/remote_triggers_to_check_test.go
+++ b/database/redis/remote_triggers_to_check_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestRemoteTriggerToCheck(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Trigger to check get and add", t, func() {
@@ -95,7 +95,7 @@ func TestRemoteTriggerToCheck(t *testing.T) {
 
 func TestRemoteTriggerToCheckConnection(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/selfstate_test.go b/database/redis/selfstate_test.go
index 9b588107e..eff08d670 100644
--- a/database/redis/selfstate_test.go
+++ b/database/redis/selfstate_test.go
@@ -9,9 +9,9 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 )
 
-func TestSelfCheck(t *testing.T) {
+func TestSelfCheckWithWritesInChecker(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := NewDatabase(logger, config, Checker)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Self state triggers manipulation", t, func() {
@@ -56,9 +56,40 @@ func TestSelfCheck(t *testing.T) {
 	})
 }
 
+func TestSelfCheckWithWritesNotInChecker(t *testing.T) {
+	dbSources := []DBSource{Filter, API, Notifier, Cli, testSource}
+	for _, dbSource := range dbSources {
+		testSelfCheckWithWritesInDBSource(t, dbSource)
+	}
+}
+
+func testSelfCheckWithWritesInDBSource(t *testing.T, dbSource DBSource) {
+	logger, _ := logging.GetLogger("dataBase")
+	dataBase := NewDatabase(logger, config, dbSource)
+	dataBase.flush()
+	defer dataBase.flush()
+	Convey(fmt.Sprintf("Self state triggers manipulation in %s", dbSource), t, func() {
+		Convey("Update metrics checks updates count", func() {
+			err := dataBase.SetTriggerLastCheck("123", &lastCheckTest, false)
+			So(err, ShouldBeNil)
+
+			count, err := dataBase.GetChecksUpdatesCount()
+			So(count, ShouldEqual, 0)
+			So(err, ShouldBeNil)
+
+			err = dataBase.SetTriggerLastCheck("12345", &lastCheckTest, true)
+			So(err, ShouldBeNil)
+
+			count, err = dataBase.GetRemoteChecksUpdatesCount()
+			So(count, ShouldEqual, 0)
+			So(err, ShouldBeNil)
+		})
+	})
+}
+
 func TestSelfCheckErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
@@ -77,8 +108,8 @@ func TestSelfCheckErrorConnection(t *testing.T) {
 
 func TestNotifierState(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
-	emptyDataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, config)
+	emptyDataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	defer dataBase.flush()
diff --git a/database/redis/subscription_test.go b/database/redis/subscription_test.go
index ab2a0f03c..47f38d126 100644
--- a/database/redis/subscription_test.go
+++ b/database/redis/subscription_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestSubscriptionData(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -174,7 +174,7 @@ func TestSubscriptionData(t *testing.T) {
 
 func TestSubscriptionErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/tag_test.go b/database/redis/tag_test.go
index c644f70ab..987bbd572 100644
--- a/database/redis/tag_test.go
+++ b/database/redis/tag_test.go
@@ -9,7 +9,7 @@ import (
 
 func TestTagStoring(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Tags manipulation", t, func() {
@@ -44,7 +44,7 @@ func TestTagStoring(t *testing.T) {
 
 func TestTagErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/throttling_test.go b/database/redis/throttling_test.go
index 9d4043a11..59091c81c 100644
--- a/database/redis/throttling_test.go
+++ b/database/redis/throttling_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestThrottlingErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/trigger_test.go b/database/redis/trigger_test.go
index 7af507dd6..81ea44f28 100644
--- a/database/redis/trigger_test.go
+++ b/database/redis/trigger_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestTriggerStoring(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -485,7 +485,7 @@ func TestTriggerStoring(t *testing.T) {
 
 func TestRemoteTrigger(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	pattern := "test.pattern.remote1"
 	trigger := &moira.Trigger{
 		ID:          "triggerID-0000000000010",
@@ -612,7 +612,7 @@ func TestRemoteTrigger(t *testing.T) {
 
 func TestTriggerErrorConnection(t *testing.T) {
 	logger, _ := logging.GetLogger("dataBase")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/triggers_to_check_test.go b/database/redis/triggers_to_check_test.go
index 2eac14235..1a983938c 100644
--- a/database/redis/triggers_to_check_test.go
+++ b/database/redis/triggers_to_check_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestTriggerToCheck(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Trigger to check get and add", t, func() {
@@ -95,7 +95,7 @@ func TestTriggerToCheck(t *testing.T) {
 
 func TestTriggerToCheckConnection(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/database/redis/triggers_to_reindex_test.go b/database/redis/triggers_to_reindex_test.go
index 9fc3f5648..f8562b331 100644
--- a/database/redis/triggers_to_reindex_test.go
+++ b/database/redis/triggers_to_reindex_test.go
@@ -12,7 +12,7 @@ import (
 
 func TestTriggersToReindex(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -119,7 +119,7 @@ func TestTriggersToReindex(t *testing.T) {
 
 func TestTriggerToReindexConnection(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 
diff --git a/database/redis/unused_triggers_test.go b/database/redis/unused_triggers_test.go
index ee05a97a6..67fc9fd8d 100644
--- a/database/redis/unused_triggers_test.go
+++ b/database/redis/unused_triggers_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestUnusedTriggers(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, config)
+	dataBase := newTestDatabase(logger, config)
 	dataBase.flush()
 	defer dataBase.flush()
 
@@ -278,7 +278,7 @@ func TestUnusedTriggers(t *testing.T) {
 
 func TestUnusedTriggersConnection(t *testing.T) {
 	logger, _ := logging.ConfigureLog("stdout", "info", "test")
-	dataBase := NewDatabase(logger, emptyConfig)
+	dataBase := newTestDatabase(logger, emptyConfig)
 	dataBase.flush()
 	defer dataBase.flush()
 	Convey("Should throw error when no connection", t, func() {
diff --git a/integration_tests/notifier/notifier_test.go b/integration_tests/notifier/notifier_test.go
index cf72c98a1..e1c5ae965 100644
--- a/integration_tests/notifier/notifier_test.go
+++ b/integration_tests/notifier/notifier_test.go
@@ -75,7 +75,7 @@ var event = moira.NotificationEvent{
 func TestNotifier(t *testing.T) {
 	mockCtrl = gomock.NewController(t)
 	defer mockCtrl.Finish()
-	database := redis.NewDatabase(logger, redis.Config{Port: "6379", Host: "localhost"})
+	database := redis.NewDatabase(logger, redis.Config{Port: "6379", Host: "localhost"}, redis.Notifier)
 	database.SaveContact(&contact)
 	database.SaveSubscription(&subscription)
 	database.SaveTrigger(trigger.ID, &trigger)