diff --git a/skk.el b/skk.el
index 95de3aaf..217325b4 100644
--- a/skk.el
+++ b/skk.el
@@ -2344,6 +2344,11 @@ KEYS $B$H(B CANDIDATES $B$rAH$_9g$o$;$F#7$NG\?t8D$N8uJd72(B ($B8uJd?t$,(B
           (setq new-one (substring new-one 0 (match-beginning 0))))
         (setq skk-henkan-list (nconc skk-henkan-list
                                      (list new-one)))
+        ;; $B8uJd0lMw$NI=<(Cf$K(B `skk-force-registration-mode-char' $B$G<-=qEPO?(B
+        ;; $B%b!<%I$KF~$C$?>l9g!"(B`skk-henkan-count' $B$OESCf$N8uJd$r;X$7$?$^$^(B
+        ;; $B$K$J$C$F$$$k!#3NDj;~$K(B new-one $B$,<-=q$KEPO?$5$l$k$h$&!"(B
+        ;; $BKvHx$KDI2C$7$?(B new-one $B$r;X$9$h$&$K99?7$9$k!#(B
+        (setq skk-henkan-count (1- (length skk-henkan-list)))
         (when (skk-numeric-p)
           (setq orglen (length skk-henkan-list))
           (skk-num-convert skk-henkan-count)
@@ -2353,8 +2358,6 @@ KEYS $B$H(B CANDIDATES $B$rAH$_9g$o$;$F#7$NG\?t8D$N8uJd72(B ($B8uJd?t$,(B
           (setq skk-kakutei-flag t))
         (setq skk-henkan-in-minibuff-flag t
               skk-touroku-count (1+ skk-touroku-count))))
-      ;; (nth skk-henkan-count skk-henkan-list) $B$,(B nil $B$@$+$i<-=qEPO?$K(B
-      ;; $BF~$C$F$$$k!#(Bskk-henkan-count $B$r%$%s%/%j%a%s%H$9$kI,MW$O$J$$!#(B
       ;; new-one $B$,6uJ8;zNs$@$C$?$i(B nil $B$rJV$9!#(B
       (unless (string= new-one "")
         (setq skk-jisyo-updated t)  ; skk-update-jisyo $B$G;2>H(B
diff --git a/test/skk-test.el b/test/skk-test.el
index 46de35a3..817d464d 100644
--- a/test/skk-test.el
+++ b/test/skk-test.el
@@ -145,8 +145,6 @@
 
 (skk-define-e2e-test skk-henkan-in-minibuff/test4
   "辞書登録は再帰的にできる。"
-  ;; なぜか通らない。要調査。
-  (skip-when (version< emacs-version "29"))
   (okuri-nasi-entries "さい /再/"
                       "き /帰/"
                       "てき /的/")
@@ -177,8 +175,6 @@
 
 (skk-define-e2e-test skk-henkan-in-minibuff/test6
   ".で強制的に辞書登録モードに入れる"
-  ;; KNOWN-BUG ミニバッファに出ていた最初の候補が登録されるため、スキップする。
-  (skip-when t)
   (okuri-nasi-entries "かんじ /幹事/換字/あ/い/う/え/お/か/き/く/け/こ/"
                       "かん /漢/"
                       "じ /字/")
@@ -217,8 +213,6 @@
 
 (skk-define-e2e-test skk-process-prefix-or-suffix/test1
   ">で接頭辞・接尾辞を入力できる。"
-  ;; なぜか通らない。要調査。
-  (skip-when (version< emacs-version "29"))
   (okuri-nasi-entries "ぜん /全/"
                       "ぜん> /前/"
                       "じだい /時代/"
diff --git a/test/test-utils.el b/test/test-utils.el
index 99cce850..83bba2e2 100644
--- a/test/test-utils.el
+++ b/test/test-utils.el
@@ -156,8 +156,10 @@ OKURI-ARI-ENTRIES と OKURI-NASI-ENTRIES は文字列のリストであり、各
 KEEP-ORDER が nil の場合、この関数は OKURI-ARI-ENTRIES と OKURI-NASI-ENTRIES
 を破壊してソートする。"
   (unless keep-order
-    (sort okuri-ari-entries (lambda (s1 s2) (string-lessp s2 s1)))
-    (sort okuri-nasi-entries #'string-lessp))
+    (setq okuri-ari-entries
+          (sort okuri-ari-entries (lambda (s1 s2) (string-lessp s2 s1))))
+    (setq okuri-nasi-entries
+          (sort okuri-nasi-entries #'string-lessp)))
   (concat
    (mapconcat
     #'identity