diff --git a/analysis/language/ja/ja_morph_kagome.go b/analysis/language/ja/ja_morph_kagome.go
index f5dac65f..6e236bda 100644
--- a/analysis/language/ja/ja_morph_kagome.go
+++ b/analysis/language/ja/ja_morph_kagome.go
@@ -13,7 +13,7 @@ import (
 	"github.com/blevesearch/bleve/analysis"
 	"github.com/blevesearch/bleve/registry"
 
-	"github.com/ikawaha/kagome/tokenizer"
+	"github.com/ikawaha/kagome.ipadic/tokenizer"
 )
 
 const TokenizerName = "kagome"
diff --git a/analysis/language/ja/ja_morph_kagome_test.go b/analysis/language/ja/ja_morph_kagome_test.go
index d5ccc3d5..de1e934f 100644
--- a/analysis/language/ja/ja_morph_kagome_test.go
+++ b/analysis/language/ja/ja_morph_kagome_test.go
@@ -41,6 +41,32 @@ func TestKagome(t *testing.T) {
 				},
 			},
 		},
+		{
+			[]byte("関西国際空港"),
+			analysis.TokenStream{
+				{
+					Start:    0,
+					End:      6,
+					Term:     []byte("関西"),
+					Position: 1,
+					Type:     analysis.Ideographic,
+				},
+				{
+					Start:    6,
+					End:      12,
+					Term:     []byte("国際"),
+					Position: 2,
+					Type:     analysis.Ideographic,
+				},
+				{
+					Start:    12,
+					End:      18,
+					Term:     []byte("空港"),
+					Position: 3,
+					Type:     analysis.Ideographic,
+				},
+			},
+		},
 	}
 
 	tokenizer := NewKagomeMorphTokenizer()