diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go
index ca7ba29703..ecc12f79c8 100644
--- a/modules/indexer/issues/indexer_test.go
+++ b/modules/indexer/issues/indexer_test.go
@@ -14,6 +14,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
+	"gopkg.in/ini.v1"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -24,6 +25,7 @@ func TestMain(m *testing.M) {
 
 func TestBleveSearchIssues(t *testing.T) {
 	assert.NoError(t, models.PrepareTestDatabase())
+	setting.Cfg = ini.Empty()
 
 	tmpIndexerDir, err := ioutil.TempDir("", "issues-indexer")
 	if err != nil {
@@ -41,6 +43,7 @@ func TestBleveSearchIssues(t *testing.T) {
 	}()
 
 	setting.Indexer.IssueType = "bleve"
+	setting.NewQueueService()
 	InitIssueIndexer(true)
 	defer func() {
 		indexer := holder.get()
diff --git a/modules/queue/queue_test.go b/modules/queue/queue_test.go
index e41643da21..3608f68d3d 100644
--- a/modules/queue/queue_test.go
+++ b/modules/queue/queue_test.go
@@ -4,11 +4,12 @@
 
 package queue
 
-import "testing"
+import (
+	"encoding/json"
+	"testing"
 
-import "github.com/stretchr/testify/assert"
-
-import "encoding/json"
+	"github.com/stretchr/testify/assert"
+)
 
 type testData struct {
 	TestString string
diff --git a/modules/setting/queue.go b/modules/setting/queue.go
index 08f6eaf3ee..5cbee851c6 100644
--- a/modules/setting/queue.go
+++ b/modules/setting/queue.go
@@ -115,7 +115,9 @@ func getQueueSettings(name string) queueSettings {
 	return q
 }
 
-func newQueueService() {
+// NewQueueService sets up the default settings for Queues
+// This is exported for tests to be able to use the queue
+func NewQueueService() {
 	sec := Cfg.Section("queue")
 	Queue.DataDir = sec.Key("DATADIR").MustString("queues/")
 	if !path.IsAbs(Queue.DataDir) {
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index a7a916e9c2..7660999089 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -1090,5 +1090,5 @@ func NewServices() {
 	newMigrationsService()
 	newIndexerService()
 	newTaskService()
-	newQueueService()
+	NewQueueService()
 }