diff --git a/test/skk-auto-test.el b/test/skk-auto-test.el
index b77a4f3f..db10f2a0 100644
--- a/test/skk-auto-test.el
+++ b/test/skk-auto-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-auto/test1
diff --git a/test/skk-comp-test.el b/test/skk-comp-test.el
index 012f0cc4..c070fa27 100644
--- a/test/skk-comp-test.el
+++ b/test/skk-comp-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-comp/test1
diff --git a/test/skk-hint-test.el b/test/skk-hint-test.el
index ffb8228e..f948ebb7 100644
--- a/test/skk-hint-test.el
+++ b/test/skk-hint-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-hint/test1
diff --git a/test/skk-isearch-test.el b/test/skk-isearch-test.el
index 2ad81c41..265a3efc 100644
--- a/test/skk-isearch-test.el
+++ b/test/skk-isearch-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-isearch/test1
diff --git a/test/skk-jisx0201-test.el b/test/skk-jisx0201-test.el
index 9f60db07..17068907 100644
--- a/test/skk-jisx0201-test.el
+++ b/test/skk-jisx0201-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-jisx0201/test1
diff --git a/test/skk-jisx0213-test.el b/test/skk-jisx0213-test.el
index f929ab0b..12fa782f 100644
--- a/test/skk-jisx0213-test.el
+++ b/test/skk-jisx0213-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (defun skk-test-setup-jisx0213 ()
diff --git a/test/skk-num-test.el b/test/skk-num-test.el
index fb754cbf..c181cb94 100644
--- a/test/skk-num-test.el
+++ b/test/skk-num-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-num/test1
diff --git a/test/skk-sticky-test.el b/test/skk-sticky-test.el
index 9e918010..b218cc9c 100644
--- a/test/skk-sticky-test.el
+++ b/test/skk-sticky-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-sticky/test1
diff --git a/test/skk-tankan-test.el b/test/skk-tankan-test.el
index 945cd21e..65459333 100644
--- a/test/skk-tankan-test.el
+++ b/test/skk-tankan-test.el
@@ -2,6 +2,13 @@
 
 (require 'ert)
 (require 'skk)
+(require 'skk-auto)
+(require 'skk-cdb)
+(require 'skk-comp)
+(require 'skk-cus)
+(require 'skk-tankan)
+(require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (skk-define-e2e-test skk-tankan/test1
diff --git a/test/skk-test.el b/test/skk-test.el
index 46de35a3..d82a7f09 100644
--- a/test/skk-test.el
+++ b/test/skk-test.el
@@ -7,6 +7,7 @@
 (require 'skk-cus)
 (require 'skk-tankan)
 (require 'skk-version)
+(require 'skk-gadget)
 (require 'test-utils)
 
 (ert-deftest skk-compute-henkan-lists/test1 ()