diff --git a/test/ripper/test_files.rb b/test/ripper/assert_parse_files.rb
similarity index 73%
rename from test/ripper/test_files.rb
rename to test/ripper/assert_parse_files.rb
index d90cd6479e..85d20cf69e 100644
--- a/test/ripper/test_files.rb
+++ b/test/ripper/assert_parse_files.rb
@@ -5,24 +5,6 @@ module TestRipper; end
 class TestRipper::Generic < Test::Unit::TestCase
   SRCDIR = File.expand_path("../../..", __FILE__)
 
-  %w[sample ext].each do |dir|
-    define_method("test_parse_files:#{dir}") do
-      assert_parse_files(dir)
-    end
-  end
-
-  %w[lib test].each do |dir|
-    define_method("test_parse_files:#{dir}") do
-      assert_parse_files(dir, "*.rb")
-    end
-    Dir["#{SRCDIR}/#{dir}/*/"].each do |dir|
-      dir = dir[(SRCDIR.length+1)..-2]
-      define_method("test_parse_files:#{dir}") do
-        assert_parse_files(dir)
-      end
-    end
-  end
-
   def assert_parse_files(dir, pattern = "**/*.rb")
     assert_separately(%W[--disable-gem -rripper - #{SRCDIR}/#{dir} #{pattern}],
                       __FILE__, __LINE__, "#{<<-"begin;"}\n#{<<-'end;'}", timeout: Float::INFINITY)
diff --git a/test/ripper/test_files_ext.rb b/test/ripper/test_files_ext.rb
new file mode 100644
index 0000000000..b77ec0fc8d
--- /dev/null
+++ b/test/ripper/test_files_ext.rb
@@ -0,0 +1,8 @@
+require_relative 'assert_parse_files.rb'
+class TestRipper::Generic
+  %w[ext].each do |dir|
+    define_method("test_parse_files:#{dir}") do
+      assert_parse_files(dir)
+    end
+  end
+end
diff --git a/test/ripper/test_files_lib.rb b/test/ripper/test_files_lib.rb
new file mode 100644
index 0000000000..19f204da56
--- /dev/null
+++ b/test/ripper/test_files_lib.rb
@@ -0,0 +1,14 @@
+require_relative 'assert_parse_files.rb'
+class TestRipper::Generic
+  %w[lib].each do |dir|
+    define_method("test_parse_files:#{dir}") do
+      assert_parse_files(dir, "*.rb")
+    end
+    Dir["#{SRCDIR}/#{dir}/*/"].each do |dir|
+      dir = dir[(SRCDIR.length+1)..-2]
+      define_method("test_parse_files:#{dir}") do
+        assert_parse_files(dir)
+      end
+    end
+  end
+end
diff --git a/test/ripper/test_files_sample.rb b/test/ripper/test_files_sample.rb
new file mode 100644
index 0000000000..57538b1358
--- /dev/null
+++ b/test/ripper/test_files_sample.rb
@@ -0,0 +1,8 @@
+require_relative 'assert_parse_files.rb'
+class TestRipper::Generic
+  %w[sample].each do |dir|
+    define_method("test_parse_files:#{dir}") do
+      assert_parse_files(dir)
+    end
+  end
+end
diff --git a/test/ripper/test_files_test.rb b/test/ripper/test_files_test.rb
new file mode 100644
index 0000000000..5a8e368c71
--- /dev/null
+++ b/test/ripper/test_files_test.rb
@@ -0,0 +1,8 @@
+require_relative 'assert_parse_files.rb'
+class TestRipper::Generic
+  %w[test].each do |dir|
+    define_method("test_parse_files:#{dir}") do
+      assert_parse_files(dir, "*.rb")
+    end
+  end
+end
diff --git a/test/ripper/test_files_test_1.rb b/test/ripper/test_files_test_1.rb
new file mode 100644
index 0000000000..25db87783e
--- /dev/null
+++ b/test/ripper/test_files_test_1.rb
@@ -0,0 +1,9 @@
+require_relative 'assert_parse_files.rb'
+class TestRipper::Generic
+  Dir["#{SRCDIR}/test/[-a-n]*/"].each do |dir|
+    dir = dir[(SRCDIR.length+1)..-2]
+    define_method("test_parse_files:#{dir}") do
+      assert_parse_files(dir)
+    end
+  end
+end
diff --git a/test/ripper/test_files_test_2.rb b/test/ripper/test_files_test_2.rb
new file mode 100644
index 0000000000..24e935e71e
--- /dev/null
+++ b/test/ripper/test_files_test_2.rb
@@ -0,0 +1,9 @@
+require_relative 'assert_parse_files.rb'
+class TestRipper::Generic
+  Dir["#{SRCDIR}/test/[o-z]*/"].each do |dir|
+    dir = dir[(SRCDIR.length+1)..-2]
+    define_method("test_parse_files:#{dir}") do
+      assert_parse_files(dir)
+    end
+  end
+end