diff --git a/modules/indexer/issues/bleve_test.go b/modules/indexer/issues/bleve_test.go
index 720266e3b5bf..8ec274566fa3 100644
--- a/modules/indexer/issues/bleve_test.go
+++ b/modules/indexer/issues/bleve_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestIndexAndSearch(t *testing.T) {
+func TestBleveIndexAndSearch(t *testing.T) {
 	dir := "./bleve.index"
 	indexer := NewBleveIndexer(dir)
 	defer os.RemoveAll(dir)
diff --git a/modules/indexer/issues/indexer.go b/modules/indexer/issues/indexer.go
index c5d6d05a6064..4d7e64adc703 100644
--- a/modules/indexer/issues/indexer.go
+++ b/modules/indexer/issues/indexer.go
@@ -72,6 +72,7 @@ func InitIssueIndexer(syncReindex bool) error {
 	}
 
 	if dummyQueue {
+		issueIndexerUpdateQueue = &DummyQueue{}
 		return nil
 	}
 
diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go
index 66087e3e6bca..6ecd9fe77908 100644
--- a/modules/indexer/issues/indexer_test.go
+++ b/modules/indexer/issues/indexer_test.go
@@ -26,16 +26,42 @@ func TestMain(m *testing.M) {
 	models.MainTest(m, filepath.Join("..", "..", ".."))
 }
 
-func TestSearchIssues(t *testing.T) {
+func TestBleveSearchIssues(t *testing.T) {
 	assert.NoError(t, models.PrepareTestDatabase())
 
 	os.RemoveAll(setting.Indexer.IssueIndexerQueueDir)
 	os.RemoveAll(setting.Indexer.IssuePath)
+	setting.Indexer.IssueType = "bleve"
 	if err := InitIssueIndexer(true); err != nil {
 		fatalTestError("Error InitIssueIndexer: %v\n", err)
 	}
 
-	time.Sleep(10 * time.Second)
+	time.Sleep(5 * time.Second)
+
+	ids, err := SearchIssuesByKeyword(1, "issue2")
+	assert.NoError(t, err)
+	assert.EqualValues(t, []int64{2}, ids)
+
+	ids, err = SearchIssuesByKeyword(1, "first")
+	assert.NoError(t, err)
+	assert.EqualValues(t, []int64{1}, ids)
+
+	ids, err = SearchIssuesByKeyword(1, "for")
+	assert.NoError(t, err)
+	assert.EqualValues(t, []int64{1, 2, 3, 5}, ids)
+
+	ids, err = SearchIssuesByKeyword(1, "good")
+	assert.NoError(t, err)
+	assert.EqualValues(t, []int64{1}, ids)
+}
+
+func TestDBSearchIssues(t *testing.T) {
+	assert.NoError(t, models.PrepareTestDatabase())
+
+	setting.Indexer.IssueType = "db"
+	if err := InitIssueIndexer(true); err != nil {
+		fatalTestError("Error InitIssueIndexer: %v\n", err)
+	}
 
 	ids, err := SearchIssuesByKeyword(1, "issue2")
 	assert.NoError(t, err)