diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a473a78fc9..8da6c42ab8 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -14,6 +14,7 @@ jobs:
     - name: Download test readline
       run: |
         sh ./download-test_readline.sh
-    - name: Run test
-      run: |
-        rake ci-test
+    - name: rake test
+      run:  rake test
+    - name: rake ci-test
+      run:  rake ci-test
diff --git a/.github/workflows/ubuntu-rvm.yml b/.github/workflows/ubuntu-rvm.yml
index 894744d8e9..791bcf9fca 100644
--- a/.github/workflows/ubuntu-rvm.yml
+++ b/.github/workflows/ubuntu-rvm.yml
@@ -26,7 +26,11 @@ jobs:
     - name: Download test readline
       run: |
         sh ./download-test_readline.sh
-    - name: Run test
+    - name: rake test
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        bundle exec rake test
+    - name: rake ci-test
       run: |
         source $HOME/.rvm/scripts/rvm
         bundle exec rake ci-test
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index ca1681abfc..3160d9f5a6 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -21,6 +21,7 @@ jobs:
     - name: Download test readline
       run: |
         sh ./download-test_readline.sh
-    - name: Run test
-      run: |
-        rake ci-test
+    - name: rake test
+      run:  rake test
+    - name: rake ci-test
+      run:  rake ci-test
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1f18363509..108d848e2b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,5 +22,7 @@ jobs:
           bundle install
       - name: Download test readline
         run:  ./download-test_readline.ps1
-      - name: Run test
-        run: rake ci-test
+      - name: rake test
+        run:  rake test
+      - name: rake ci-test
+        run:  rake ci-test
diff --git a/Rakefile b/Rakefile
index 47962f3fe1..2b10365598 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ ENCODING_LIST.each_pair do |task_name, encoding|
     t.libs << 'test'
     t.libs << 'lib'
     t.loader = :direct
-    t.pattern = 'test/**/test_*.rb'
+    t.pattern = 'test/reline/test_*.rb'
   end
 end
 
@@ -27,9 +27,9 @@ ENCODING_LIST.each_pair do |task_name, encoding|
     t.ruby_opts << %Q{-I. -e "RELINE_TEST_ENCODING=Encoding.find('#{encoding.name}')"}
     t.libs << 'tool'
     t.libs << 'lib'
-    t.libs << 'tool/lib'
     t.loader = :direct
-    t.pattern = 'test/**/test_*.rb'
+    t.libs << 'tool/lib'
+    t.pattern = 'test/ext/**/test_*.rb'
   end
 end