diff --git a/store/sqlstore/store.go b/store/sqlstore/store.go
index af6f8dedb4..212e01441b 100644
--- a/store/sqlstore/store.go
+++ b/store/sqlstore/store.go
@@ -1017,6 +1017,10 @@ func (ss *SqlStore) Close() {
 	for _, replica := range ss.replicas {
 		replica.Db.Close()
 	}
+
+	for _, replica := range ss.searchReplicas {
+		replica.Db.Close()
+	}
 }
 
 func (ss *SqlStore) LockToMaster() {
diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go
index 256cae99d6..52dee3f359 100644
--- a/store/sqlstore/store_test.go
+++ b/store/sqlstore/store_test.go
@@ -166,9 +166,6 @@ func TestStoreLicenseRace(t *testing.T) {
 	store := New(*settings, nil)
 	defer func() {
 		store.Close()
-		for _, replica := range store.searchReplicas {
-			require.NoError(t, replica.Db.Close())
-		}
 		storetest.CleanupSqlSettings(settings)
 	}()
 
@@ -267,9 +264,6 @@ func TestGetReplica(t *testing.T) {
 			store := New(*settings, nil)
 			defer func() {
 				store.Close()
-				for _, replica := range store.searchReplicas {
-					require.NoError(t, replica.Db.Close())
-				}
 				storetest.CleanupSqlSettings(settings)
 			}()
 
@@ -341,9 +335,6 @@ func TestGetReplica(t *testing.T) {
 			store := New(*settings, nil)
 			defer func() {
 				store.Close()
-				for _, replica := range store.searchReplicas {
-					require.NoError(t, replica.Db.Close())
-				}
 				storetest.CleanupSqlSettings(settings)
 			}()
 
@@ -497,9 +488,6 @@ func TestGetAllConns(t *testing.T) {
 			store := New(*settings, nil)
 			defer func() {
 				store.Close()
-				for _, replica := range store.searchReplicas {
-					require.NoError(t, replica.Db.Close())
-				}
 				storetest.CleanupSqlSettings(settings)
 			}()