diff --git a/neutrino.go b/neutrino.go
index a251150a4..53a57d57c 100644
--- a/neutrino.go
+++ b/neutrino.go
@@ -630,13 +630,15 @@ func NewChainService(cfg Config) (*ChainService, error) {
 	}
 	s.BlockCache = lru.NewCache(blockCacheSize)
 
-	s.BlockHeaders, err = headerfs.NewBlockHeaderStore(cfg.DataDir,
-		cfg.Database, &cfg.ChainParams)
+	s.BlockHeaders, err = headerfs.NewBlockHeaderStore(
+		cfg.DataDir, cfg.Database, &cfg.ChainParams,
+	)
 	if err != nil {
 		return nil, err
 	}
-	s.RegFilterHeaders, err = headerfs.NewFilterHeaderStore(cfg.DataDir,
-		cfg.Database, headerfs.RegularFilter, &cfg.ChainParams)
+	s.RegFilterHeaders, err = headerfs.NewFilterHeaderStore(
+		cfg.DataDir, cfg.Database, headerfs.RegularFilter, &cfg.ChainParams,
+	)
 	if err != nil {
 		return nil, err
 	}
diff --git a/query_test.go b/query_test.go
index c98f5ae93..afc0e18ec 100644
--- a/query_test.go
+++ b/query_test.go
@@ -254,7 +254,7 @@ func TestBlockCache(t *testing.T) {
 
 	// We'll use a simple mock header store since the GetBlocks method
 	// assumes we only query for blocks with an already known header.
-	headers := headerfs.NewMockBlockHeaderStore()
+	headers := newMockBlockHeaderStore()
 
 	// Iterate through the blocks, calculating the size of half of them,
 	// and writing them to the header store.